diff --git a/autobuild/build b/autobuild/build
index 1a4c7ae0..98c1650d 100644
--- a/autobuild/build
+++ b/autobuild/build
@@ -6,7 +6,5 @@ rm -rf $PKGDIR/usr/lib/autobuild3/{contrib,*.md,TODO,*.tar.xz,*.deb,autobuild}
 sed -e "s/VERSION=3/VERSION=$PKGVER/g" -i $PKGDIR/usr/lib/autobuild3/ab3.sh
 # Symlinking
 ln -sf /usr/lib/autobuild3/ab3.sh $PKGDIR/usr/bin/autobuild 
-rm -rf $PKGDIR/etc/autobuild/defaults
-ln -sv /usr/lib/autobuild3/etc/defaults $PKGDIR/etc/autobuild/
-
-rm -rf abdist/etc/autobuild/defaults/defaults
+mkdir abdist/etc/
+ln -sv /usr/lib/autobuild3/etc/autobuild abdist/etc/autobuild
diff --git a/autobuild/conffiles b/autobuild/conffiles
index eb2b1461..44b64411 100644
--- a/autobuild/conffiles
+++ b/autobuild/conffiles
@@ -1,6 +1,2 @@
-/etc/autobuild/prefix
-/usr/lib/autobuild3/etc/defaults/offical_builds
-/usr/lib/autobuild3/etc/defaults/elffltr_strip
-/usr/lib/autobuild3/etc/defaults/compress
-/usr/lib/autobuild3/etc/defaults/pm
-/usr/lib/autobuild3/etc/defaults/elffltr_elfdep
+/usr/lib/autobuild3/etc/autobuild/defaults/pm
+/usr/lib/autobuild3/etc/autobuild/prefix
diff --git a/etc/defaults/abmisc b/etc/autobuild/defaults/abmisc
similarity index 100%
rename from etc/defaults/abmisc
rename to etc/autobuild/defaults/abmisc
diff --git a/etc/defaults/compress b/etc/autobuild/defaults/compress
similarity index 100%
rename from etc/defaults/compress
rename to etc/autobuild/defaults/compress
diff --git a/etc/defaults/elffltr_elfdep b/etc/autobuild/defaults/elffltr_elfdep
similarity index 100%
rename from etc/defaults/elffltr_elfdep
rename to etc/autobuild/defaults/elffltr_elfdep
diff --git a/etc/defaults/elffltr_strip b/etc/autobuild/defaults/elffltr_strip
similarity index 100%
rename from etc/defaults/elffltr_strip
rename to etc/autobuild/defaults/elffltr_strip
diff --git a/etc/defaults/flags b/etc/autobuild/defaults/flags
similarity index 100%
rename from etc/defaults/flags
rename to etc/autobuild/defaults/flags
diff --git a/etc/defaults/offical_builds b/etc/autobuild/defaults/offical_builds
similarity index 100%
rename from etc/defaults/offical_builds
rename to etc/autobuild/defaults/offical_builds
diff --git a/etc/defaults/pm b/etc/autobuild/defaults/pm
similarity index 100%
rename from etc/defaults/pm
rename to etc/autobuild/defaults/pm
diff --git a/autobuild/overrides/etc/autobuild/prefix b/etc/autobuild/prefix
similarity index 100%
rename from autobuild/overrides/etc/autobuild/prefix
rename to etc/autobuild/prefix
diff --git a/proc/10-defines.sh b/proc/10-defines.sh
index da6e7349..57047ca5 100644
--- a/proc/10-defines.sh
+++ b/proc/10-defines.sh
@@ -2,7 +2,7 @@ export SRCDIR="$PWD"
 export PKGDIR="$PWD/abdist"
 
 # Autobuild settings
-recsr $AB/etc/defaults/*
+recsr $AB/etc/autobuild/defaults/*
 
 [ -e autobuild/defines ] && { . autobuild/defines || abwarn "autobuild/defines returned a non-zero value." 
 } || aberr "autobuild/defines not found."