diff --git a/xterm.spec b/xterm.spec
index 7e1fd37..e4f3469 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -1,10 +1,15 @@
-%define _x11bindir /usr/X11R6/bin
+%{?!modularX11:    %define modularX11 1}
+%if %{modularX11}
+%define _x11bindir  /usr/bin/X11
+%define _x11datadir /usr/lib
+%else
+%define _x11bindir  /usr/X11R6/bin
 %define _x11datadir /usr/X11R6/lib
-
+%endif
 Summary: xterm terminal emulator for the X Window System
 Name: xterm
 Version: 206
-Release: 1
+Release: 2
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -14,7 +19,7 @@ Patch0: xterm-can-2003-0063.patch
 Patch1: xterm-resources-redhat.patch
 Patch2: xterm-179-ppc-fix-bug-101472.patch
 Patch3: xterm-tty-group-name.patch
-BuildRequires: xorg-x11-devel >= 6.7.0
+BuildRequires: xorg-x11-proto-devel
 BuildRequires: utempter libtermcap-devel
 
 %description
@@ -40,6 +45,7 @@ programs that can't use the window system directly.
            --enable-wide-chars \
            --with-utempter \
            --disable-tek4014 \
+	   %{?modularX11: --enable-narrowproto} \
            %{?_with_256_color:--enable-256-color};
 export XTERM_TTY_GROUP_NAME=tty;
 make
@@ -60,7 +66,7 @@ mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 # correctly without surprises
 {
   mkdir -p $RPM_BUILD_ROOT%{_x11bindir}
-  ln -sf ../../bin/xterm $RPM_BUILD_ROOT%{_x11bindir}/xterm
+  ln -sf /usr/bin/xterm $RPM_BUILD_ROOT%{_x11bindir}/xterm
 }
 
 %clean