diff --git a/docs/source/markdown/podman-build.1.md.in b/docs/source/markdown/podman-build.1.md.in
index eeaaac6b29..5397c4149d 100644
--- a/docs/source/markdown/podman-build.1.md.in
+++ b/docs/source/markdown/podman-build.1.md.in
@@ -23,8 +23,10 @@ directory, Podman uses the Containerfile's parent directory as its build context
 
 Containerfiles ending with a ".in" suffix are preprocessed via CPP(1).  This
 can be useful to decompose Containerfiles into several reusable parts that can
-be used via CPP's **#include** directive.  Notice, a Containerfile.in file can
-still be used by other tools when manually preprocessing them via `cpp -E`.
+be used via CPP's **#include** directive. Containerfiles ending in .in are
+restricted to no comment lines unless they are CPP commands.
+Note, a Containerfile.in file can still be used by other tools when manually
+preprocessing them via `cpp -E`.
 
 When the URL is an archive, the contents of the URL is downloaded to a temporary
 location and extracted before execution.
diff --git a/rpm/podman.spec b/rpm/podman.spec
index 6092b3b4f1..fc8c14e6eb 100644
--- a/rpm/podman.spec
+++ b/rpm/podman.spec
@@ -7,12 +7,18 @@
 %global debug_package %{nil}
 %endif
 
-# RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
-# set it separately here and do not depend on RHEL 8's go-srpm-macros package.
-%if %{defined rhel} && 0%{?rhel} == 8
+# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
+# set it separately here and do not depend on RHEL's go-[s]rpm-macros package
+# until that's fixed.
+# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328
+# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331
+%if %{defined rhel} && !%{defined eln}
 %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
+# python3 dep conditional for rhel8
+%if %{?rhel} == 8
 %define rhel8py3 1
 %endif
+%endif
 
 %global gomodulesmode GO111MODULE=on