diff --git a/macros b/macros
index 54634d5..2c48c7d 100644
--- a/macros
+++ b/macros
@@ -92,6 +92,7 @@
     %{__os_install_post}\
 %{nil}
 
+
 #	Template for debug information sub-package.
 # NOTE: This is a copy from rpm to get the ifnarch noarch fix, it can be removed later
 %debug_package \
@@ -111,7 +112,6 @@ package or when debugging this package.\
 
 # Bad hack to set $LANG to C during all RPM builds
 %prep \
-%{?_enable_debug_packages:%{debug_package}}\
 %%prep\
 LANG=C\
 export LANG\
@@ -122,7 +122,8 @@ LANG=C\
 export LANG\
 %{nil}
 
-%install %%install\
+%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
+%%install\
 LANG=C\
 export LANG\
 %{nil}
@@ -141,9 +142,5 @@ export LANG\
 # Should unpackaged files in a build root terminate a build?
 %_unpackaged_files_terminate_build    1
 
-#
-# Use rpm's built in dependency generator?
-%_use_internal_dependency_generator 1
-
 %__find_provides        /usr/lib/rpm/redhat/find-provides
 %__find_requires        /usr/lib/rpm/redhat/find-requires
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index d59c5d0..46c0c52 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,6 +1,6 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.13
+Version: 8.0.14
 Release: 1
 License: GPL
 Group: Development/System
@@ -27,6 +27,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Sat Dec 14 2002 Tim Powers <timp@redhat.com> 8.0.14-1
+- tweak debug package stuff so that we are overloading %%install
+  instead of %%post
+
 * Sat Dec 14 2002 Tim Powers <timp@redhat.com> 8.0.13-1
 - turn on internal rpm dep generation by default