diff --git a/apt.spec b/apt.spec
index c1865ea..317b745 100644
--- a/apt.spec
+++ b/apt.spec
@@ -6,7 +6,7 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          System Environment/Base
 URL:            http://apt-rpm.laiskiainen.org/
 License:        GPL
@@ -32,20 +32,10 @@ Source22:       apt.sysconfig
 Source50:       preserve-conf.lua
 Source51:       upgradevirt.lua
 
-# 100-149 for sources.list.d
-Source100:      fedora-core.list
-Source101:      fedora-extras.list
-Source102:      fedora-updates.list
-
 # 150-199 for apt.conf.d
-# "factory defaults" for Fedora Core + Extras
+# "factory defaults"
 Source150:      default.conf
 
-# 200-249 for additional trusted gpg keys
-
-# 250-299 for vendor.list.d
-Source250:      fedora-vendor.list
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # TODO: verify the required minimum Python version
@@ -75,6 +65,7 @@ Requires(preun): chkconfig
 %if 0%{!?_with_groupinstall:1}
 Obsoletes:      %{name}-groupinstall < %{version}-%{release}
 %endif
+Requires:	apt-config
 
 %description
 APT-RPM is a port of Debian's apt tools for RPM based distributions.
@@ -175,15 +166,8 @@ install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
 install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
 install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
 
-# Default source list entries
-for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do
-  install -pm 644 $source $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d/
-done
-
 # install config parts
 install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
-install -pm 644 %{SOURCE250} \
-  $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
 # GPG keys
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
@@ -250,12 +234,12 @@ fi
 %config(noreplace) %{_sysconfdir}/apt/rpmpriorities
 %config(noreplace) %{_sysconfdir}/apt/sources.list
 %config(noreplace) %{_sysconfdir}/apt/vendors.list
-# NOTE: no noreplace on *.d because we WANT to be able to change the defaults
-# without user intervention!
 %dir %{_sysconfdir}/apt/apt.conf.d/
-%config %{_sysconfdir}/apt/apt.conf.d/default.conf
-%config %{_sysconfdir}/apt/sources.list.d/
-%config %{_sysconfdir}/apt/vendors.list.d/
+# NOTE: no noreplace because we WANT to be able to change the defaults
+# without user intervention!
+%config %{_sysconfdir}/apt/apt.conf.d/defaults.conf
+%dir %{_sysconfdir}/apt/sources.list.d/
+%dir %{_sysconfdir}/apt/vendors.list.d/
 
 %config(noreplace) %{_sysconfdir}/sysconfig/apt
 %config %{_sysconfdir}/cron.daily/apt.cron
@@ -308,7 +292,10 @@ fi
 
 
 %changelog
-* Tue Apr 25 2006 Axel Thimm <thimm@neu.nirvana>
+* Mon May  8 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 0.5.15lorg3-2
+- Split off configuration files from apt.
+
+* Tue Apr 25 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 0.5.15lorg3-1
 - Update to 0.5.15lorg3 final.
 - Fix URL.
 
diff --git a/default.conf b/default.conf
index 39d0534..92b4087 100644
--- a/default.conf
+++ b/default.conf
@@ -17,7 +17,6 @@ APT
   {
     AllNames "false";
   }  
-  DistroVerPkg "fedora-release";
 };
 
 RPM
@@ -55,7 +54,7 @@ RPM
 // Options for the downloading routines
 Acquire
 {
-  http::User-Agent "Fedora APT-HTTP/1.3";
+  http::User-Agent "APT-HTTP/1.3";
 };
 
 Scripts