diff --git a/xterm.spec b/xterm.spec
index 88375b5..3b65561 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -1,16 +1,18 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 215
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
 #Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz
 #         ^-  now shipped in upstream source tarball
 Source2: ftp://invisible-island.net/xterm/UnicodeData-Latest.txt.gz
 Source3: ftp://invisible-island.net/xterm/16colors.txt
+
 Patch0: xterm-can-2003-0063.patch
 Patch1: xterm-resources-redhat.patch
 Patch2: xterm-179-ppc-fix-bug-101472.patch
@@ -27,6 +29,8 @@ Patch12: xterm-212-bz186935.patch
 Patch13: xterm-212-redhat-resources.patch
 Patch14: xterm-212-man-page_paths.patch
 Patch15: xterm-213-bz189161.patch
+
+BuildRequires: pkgconfig
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
 BuildRequires: libXrender-devel
@@ -43,7 +47,7 @@ BuildRequires: fontconfig-devel
 BuildRequires: expat-devel
 BuildRequires: zlib-devel
 BuildRequires: libtermcap-devel
-BuildRequires: utempter
+BuildRequires: libutempter-devel
 
 %{?!DEBUGINFO:     %define DEBUGINFO    1}
 %{?!enable_trace:  %define enable_trace 0}
@@ -51,7 +55,8 @@ BuildRequires: utempter
 %define debug_package %{nil}
 %endif
 
-%define x11_app_defaults_dir %{_datadir}/X11/app-defaults
+%define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
+
 %{?!_with_256_color: %define _with_256_color 1}
 %{?!_with_tek4014: %define _with_tek4014 1}
 
@@ -128,10 +133,11 @@ exit 0
 %endif
 
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 %{_bindir}/resize
 %{_bindir}/uxterm
 %{_bindir}/xterm
@@ -140,9 +146,14 @@ exit 0
 %{x11_app_defaults_dir}/UXTerm
 %{x11_app_defaults_dir}/XTerm
 %{x11_app_defaults_dir}/XTerm-color
-%doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Wed Jul 26 2006 Mike A. Harris <mharris@redhat.com> 215-2.fc6
+- Replace BuildRequires utempter with libutempter-devel
+- Change BuildRoot tag to comply with Fedora packaging guidelines
+- Use pkg-config to autodetect the location of the system app-defaults dir
+- Add BuildRequires: pkgconfig
+
 * Mon Jul 17 2006 Jason Vas Dias <jvdias@redhat.com> - 215-1.fc6
 - Upgrade to upstream version 215