diff --git a/plymouth.changes b/plymouth.changes
index 822c9c8..696ca11 100644
--- a/plymouth.changes
+++ b/plymouth.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Aug  4 03:51:50 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Use bcond_with for X11 renderer, cleanup syntax
+
 -------------------------------------------------------------------
 Wed Jul 31 11:36:57 UTC 2019 - Cliff Zhao <qzhao@suse.com>
 
diff --git a/plymouth.spec b/plymouth.spec
index 7d9398c..a0fbdbd 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -16,10 +16,9 @@
 #
 
 
-# plymouth's Xwindow backend render will import many new gtk functions in build period,
-# this will increase the compilation complexity. and the Xwindow render is not used in 
-# the production envronment.
-%define support_Xwindow_backend 0
+# plymouth's X11 renderer adds many GTK3 packages to the build cycle,
+# it is not used in the production environment.
+%bcond_with x11_renderer
 
 %define plymouthdaemon_execdir %{_sbindir}
 %define plymouthclient_execdir %{_bindir}
@@ -73,7 +72,7 @@ BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(pango) >= 1.21.0
 BuildRequires:  pkgconfig(systemd) >= 186
 
-%if 0%{?support_Xwindow_backend} > 0
+%if %{with x11_renderer}
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.14.0
 %endif
 
@@ -135,7 +134,7 @@ This package contains the libply library used by Plymouth.
 Summary:        Libraries and headers for writing Plymouth splash plugins
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
-%if 0%{?support_Xwindow_backend} == 0
+%if %{with x11_renderer}
 Requires:       %{name}-x11-renderer = %{version}
 %endif
 Requires:       libply-boot-client4 = %{version}
@@ -157,16 +156,14 @@ Supplements:    packageand(plymouth:dracut)
 %description dracut
 This package contains utilities that integrate dracut with Plymouth
 
-%if 0%{?support_Xwindow_backend} == 0
-#%package x11-renderer
+%package x11-renderer
 Summary:        Plymouth X11 renderer
 Group:          System/Base
 Requires:       %{name} = %{version}
 
-#%description x11-renderer
+%description x11-renderer
 This package provides the X11 renderer which allows to test plymouth
 behavior on environments with a valid DISPLAY.
-%endif
 
 %package scripts
 Summary:        Plymouth related scripts
@@ -394,7 +391,7 @@ autoreconf -fiv
            --without-rhgb-compat-link                            \
            --with-boot-tty=/dev/tty7                             \
            --with-shutdown-tty=/dev/tty1                         \
-%if 0%{?support_Xwindow_backend} == 0
+%if %{without x11_renderer}
            --disable-gtk                                         \
 %endif
            --with-release-file=%{_sysconfdir}/os-release
@@ -589,10 +586,9 @@ fi
 %{_sbindir}/plymouth-set-default-theme
 %{_libexecdir}/plymouth/plymouth-update-initrd
 
-%if 0%{?support_Xwindow_backend} == 0
-#%files x11-renderer
-#%defattr(-,root,root,-)
-#%{_libdir}/plymouth/renderers/x11*
+%if %{with x11_renderer}
+%files x11-renderer
+%{_libdir}/plymouth/renderers/x11*
 %endif
 
 %files plugin-label