diff --git a/x3270.spec b/x3270.spec
index 9ba4f7f..c778213 100644
--- a/x3270.spec
+++ b/x3270.spec
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -79,7 +79,7 @@ export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 # Set LIBX3270DIR to something we can share with x3270-text
 perl -pi -e "s,LIBX3270DIR =.*,LIBX3270DIR = /usr/lib/x3270,g" Imakefile.in
 libtoolize --copy --force
-%configure --enable-app-defaults --prefix=%{_prefix}/X11R6
+%configure --prefix=%{_prefix}/ --with-fontdir=%{_datadir}/fonts/x3270
 xmkmf -a
 make %{?_smp_mflags}
 cd c3270-3.3
@@ -94,33 +94,30 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/x3270
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/X11R6/bin
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/X11R6/man/man1
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/X11R6/lib/X11/fonts/misc
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/X11R6/lib/X11/app-defaults
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/fonts/x3270
+#mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/X11R6/lib/X11/app-defaults
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/48x48/apps
 
 # XXX Hack around mkfontdir madness on install.
-install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
-install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
-install -m644 *pcf.gz $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/misc
-install -m644 X3270.ad $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults/X3270
+install -m755 x3270 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 *pcf.gz $RPM_BUILD_ROOT%{_datadir}/fonts/x3270
+#install -m644 X3270.ad $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults/X3270
 install -m644 ibm_hosts $RPM_BUILD_ROOT%{_prefix}/lib/x3270
 for i in x3270 x3270if x3270-script ibm_hosts; do
-	install -m644 $i.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/$i.1x
+	install -m644 $i.man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1x
 done
-install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin
-install -m644 pr3287/pr3287.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/pr3287.1x
+install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
+install -m644 pr3287/pr3287.man $RPM_BUILD_ROOT%{_mandir}/man1/pr3287.1x
 cd c3270-3.3
 install -m755 c3270 $RPM_BUILD_ROOT%{_prefix}/bin
-install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
-install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
+#install -m755 x3270if $RPM_BUILD_ROOT%{_prefix}/bin
+#install -m755 pr3287/pr3287 $RPM_BUILD_ROOT%{_prefix}/bin
 for i in c3270 x3270if x3270-script ibm_hosts; do
     install -m644 $i.man $RPM_BUILD_ROOT%{_mandir}/man1/$i.1
 done
 cd ..
 
-install -m644 X3270.xad ${RPM_BUILD_ROOT}%{_prefix}/X11R6/lib/X11/app-defaults/X3270
 install -m644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities
 install -m644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/applnk/Utilities
@@ -142,16 +139,17 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
 
 rm -f Examples/*.rh
 chmod -x Examples/*
-for i in pr3287 x3270if; do
-	mv $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin/$i $RPM_BUILD_ROOT/%{_bindir}
-	ln -s ../../bin/$i $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin
-done
+#for i in pr3287 x3270if; do
+	#mv $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin/$i $RPM_BUILD_ROOT/%{_bindir}
+	#ln -s ../../bin/$i $RPM_BUILD_ROOT/%{_prefix}/X11R6/bin
+#done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post x11
-cd %{_prefix}/X11R6/lib/X11/fonts/misc && %{_prefix}/X11R6/bin/mkfontdir
+cd %{_datadir}/fonts/x3270 && %{_prefix}/X11R6/bin/mkfontdir
+/usr/sbin/chkfontpath -a /usr/share/fonts/x3270
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -159,7 +157,8 @@ fi
 
 %postun x11
 if [ "$1" = "0" ]; then
-  cd %{_prefix}/X11R6/lib/X11/fonts/misc && %{_prefix}/X11R6/bin/mkfontdir
+  cd %{_datadir}/fonts/x3270 && %{_prefix}/X11R6/bin/mkfontdir
+  /usr/sbin/chkfontpath -r /usr/share/fonts/x3270
 fi
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -178,18 +177,17 @@ fi
 
 %files x11
 %defattr(-,root,root)
-%{_prefix}/X11R6/bin/x3270
-%{_prefix}/X11R6/bin/pr3287
-%{_prefix}/X11R6/bin/x3270if
-%{_prefix}/X11R6/lib/X11/fonts/misc/3270*
-%{_prefix}/X11R6/man/man1/*
+%{_prefix}/bin/x3270
+%dir %{_datadir}/fonts/x3270
+%{_datadir}/fonts/x3270/*
+%{_mandir}/man1/*
 %{_datadir}/icons/hicolor/48x48/apps/x3270.png
 %if %{desktop_file}
 %{_datadir}/applications/*
 %else
 %config(missingok) %{_sysconfdir}/X11/applnk/Utilities/*
 %endif
-%config %{_prefix}/X11R6/lib/X11/app-defaults/X3270
+#%config %{_prefix}/X11R6/lib/X11/app-defaults/X3270
 
 %files text
 %defattr(-,root,root)
@@ -197,6 +195,9 @@ fi
 %{_mandir}/man1/c3270*
 
 %changelog
+* Wed Oct 19 2005 Karsten Hopp <karsten@redhat.de> 3.3.4-6
+- move x3270-x11 files from /usr/X11R6 to /usr (#170938)
+  
 * Thu Sep 08 2005 Karsten Hopp <karsten@redhat.de> 3.3.4-5
 - add missing buildrequires so that x3270 will be built with SSL support
   (#159527)