4 files changed, 16 insertions, 3 deletions
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index d94890f2..9e343aa2 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -11,6 +11,8 @@ ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?),
 OSVER = centos6
 else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0)
 OSVER = centos7
+else ifeq ($(shell rpm --eval "%{?rhel}"), 8)
+OSVER = centos8
 else ifeq ($(shell rpm --eval "%{?amzn}"), 1)
 OSVER = amazonlinux1
 else ifeq ($(shell rpm --eval "%{?amzn}"), 2)
@@ -63,6 +65,17 @@ include Makefile.jsc8
 include Makefile.jsc11
 endif
 
+ifeq ($(OSVER), centos8)
+include Makefile.php
+include Makefile.python27
+include Makefile.python36
+include Makefile.go
+include Makefile.perl
+include Makefile.jsc-common
+include Makefile.jsc8
+include Makefile.jsc11
+endif
+
 ifeq ($(OSVER), amazonlinux1)
 include Makefile.php
 include Makefile.python27
diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27
index 005eff17..95b392a9 100644
--- a/pkg/rpm/Makefile.python27
+++ b/pkg/rpm/Makefile.python27
@@ -15,7 +15,7 @@ MODULE_SOURCES_python27=	unit.example-python-app \
 
 ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles))
 BUILD_DEPENDS_python27=	python-devel
-else ifeq ($(OSVER), fedora)
+else ifneq (,$(findstring $(OSVER),fedora centos8))
 BUILD_DEPENDS_python27=	python2-devel
 else
 BUILD_DEPENDS_python27=	python27-devel
diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
index 6a229c0f..2ef4ff1b 100644
--- a/pkg/rpm/unit.module.spec.in
+++ b/pkg/rpm/unit.module.spec.in
@@ -44,7 +44,7 @@ This package contains %%SUMMARY%%.
 %debug_package
 %endif
 
-%if 0%{?fedora}
+%if (0%{?fedora}) || (0%{?rhel} >= 8)
 %define _debugsource_template %{nil}
 %endif
 
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index 05ee79af..7fc950ec 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -67,7 +67,7 @@ dynamically via an API.
 %debug_package
 %endif
 
-%if 0%{?fedora}
+%if (0%{?fedora}) || (0%{?rhel} >= 8)
 %define _debugsource_template %{nil}
 %endif