diff --git a/config/autoconf-2-1.cfg b/config/autoconf-2-1.cfg
index cfa0d56..fbb1910 100644
--- a/config/autoconf-2-1.cfg
+++ b/config/autoconf-2-1.cfg
@@ -4,6 +4,10 @@
 # This configuration file configure's, make's and install's autoconf
 #
 
+ifn %{defined _internal_autotools}
+  %define _internal_autotools no
+%endfi
+
 Name:      autoconf-%{autoconf_version}-%{_host}-%{release}
 Summary:   Autoconf v%{autoconf_version} for host %{_host}
 Version:   %{autoconf_version}
@@ -11,9 +15,6 @@ Release:   %{release}
 URL: 	   http://www.gnu.org/software/autoconf/
 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
-%description
-Autoconf for host %{_host}.
-
 #
 # Source
 #
@@ -36,7 +37,7 @@ cd ..
   if "%{_internal_autotools}" == "yes"; then
     ac_prefix=$SB_TMPPREFIX
   else
-    ac_prefix=%{prefix}
+    ac_prefix=%{_prefix}
   fi
 
 %if "%{_build}" != "%{_host}"
diff --git a/config/autoconf-2.68-1.cfg b/config/autoconf-2.68-1.cfg
index 0f91e72..c01f8fc 100644
--- a/config/autoconf-2.68-1.cfg
+++ b/config/autoconf-2.68-1.cfg
@@ -2,8 +2,8 @@
 # Autoconf 2.68.
 #
 
-%ifn %{defined release}
-%error No 'release' defined
+%if %{release} == %{nil}
+%define release 1
 %endif
 
 %include %{_configdir}/base.cfg
diff --git a/config/autoconf-2.69-1.cfg b/config/autoconf-2.69-1.cfg
index 5d7a890..28c26c9 100644
--- a/config/autoconf-2.69-1.cfg
+++ b/config/autoconf-2.69-1.cfg
@@ -2,19 +2,14 @@
 # Autoconf 2.22.
 #
 
-%ifn %{defined release}
-%error No 'release' defined
+%if %{release} == %{nil}
+%define release 1
 %endif
 
 %include %{_configdir}/base.cfg
 
 %define autoconf_version 2.69
 
-Name: autoconf-%{autoconf_version}-%{_host}-%{release}
-
-%description
-Autoconf for host %{_host}.
-
 #
 # The autoconf build instructions. We use 2.xx Release 1.
 #
diff --git a/config/automake-1-1.cfg b/config/automake-1-1.cfg
index 886d9a7..fa0fde3 100644
--- a/config/automake-1-1.cfg
+++ b/config/automake-1-1.cfg
@@ -3,8 +3,10 @@
 #
 # This configuration file configure's, make's and install's automake
 #
-# Warning: this package is only for bootstrapping within a build.
-#
+
+ifn %{defined _internal_autotools}
+  %define _internal_autotools no
+%endfi
 
 Name:      automake-%{automake_version}-%{_host}-%{release}
 Summary:   Automake v%{automake_version} for host %{_host}
@@ -13,9 +15,6 @@ Release:   %{release}
 URL: 	   http://www.gnu.org/software/automake/
 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
-%description
-Automake for host %{_host}.
-
 #
 # Source
 #
@@ -39,7 +38,7 @@ cd ..
   if "%{_internal_autotools}" == "yes"; then
     am_prefix=$SB_TMPPREFIX
   else
-    am_prefix=%{prefix}
+    am_prefix=%{_prefix}
   fi
 
 %if "%{_build}" != "%{_host}"
diff --git a/config/automake-1.12-1.cfg b/config/automake-1.12-1.cfg
index f71ef83..ca04bf7 100644
--- a/config/automake-1.12-1.cfg
+++ b/config/automake-1.12-1.cfg
@@ -2,8 +2,8 @@
 # Automake 1.12
 #
 
-%ifn %{defined release}
-%error No 'release' defined
+%if %{release} == %{nil}
+%define release 1
 %endif
 
 %include %{_configdir}/base.cfg
diff --git a/config/binutils-2-1.cfg b/config/binutils-2-1.cfg
index 50b576f..415d74f 100644
--- a/config/binutils-2-1.cfg
+++ b/config/binutils-2-1.cfg
@@ -13,9 +13,6 @@ Release:   %{release}
 URL: 	   http://sources.redhat.com/binutils
 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
-%description
-Cross binutils for target %{_target}.
-
 #
 # Source
 #
diff --git a/config/binutils-2.22-1.cfg b/config/binutils-2.22-1.cfg
index 97a69e5..e585483 100644
--- a/config/binutils-2.22-1.cfg
+++ b/config/binutils-2.22-1.cfg
@@ -2,6 +2,10 @@
 # Binutils 2.22.
 #
 
+%if %{release} == %{nil}
+%define release 1
+%endif
+
 %include %{_configdir}/checks.cfg
 %include %{_configdir}/base.cfg
 
diff --git a/config/expat-2-1.cfg b/config/expat-2-1.cfg
index a40231b..3265752 100644
--- a/config/expat-2-1.cfg
+++ b/config/expat-2-1.cfg
@@ -4,8 +4,8 @@
 # This configuration file configure's, make's and install's expat.
 #
 
-%ifn %{defined release}
-%error No 'release' defined
+%if %{release} == %{nil}
+%define release 1
 %endif
 
 Name:      expat-%{expat_version}-%{_host}-%{release}
@@ -15,9 +15,6 @@ Release:   %{release}
 URL: 	   http://expat.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
-%description
-Expat for host %{_host}.
-
 #
 # Source
 #
diff --git a/config/expat-2.1.0-1.cfg b/config/expat-2.1.0-1.cfg
index 7899186..7a87aab 100644
--- a/config/expat-2.1.0-1.cfg
+++ b/config/expat-2.1.0-1.cfg
@@ -2,8 +2,8 @@
 # Expat 2.1.0
 #
 
-%ifn %{defined release}
-%error No 'release' defined
+%if %{release} == %{nil}
+%define release 1
 %endif
 
 %include %{_configdir}/base.cfg
diff --git a/config/gcc-4.6-newlib-1.20-1.cfg b/config/gcc-4.6-newlib-1.20-1.cfg
index 410cbd5..e5e5745 100644
--- a/config/gcc-4.6-newlib-1.20-1.cfg
+++ b/config/gcc-4.6-newlib-1.20-1.cfg
@@ -2,6 +2,10 @@
 # GCC 2.6, Newlib 1.20
 #
 
+%if %{release} == %{nil}
+%define release 1
+%endif
+
 %include %{_configdir}/checks.cfg
 %include %{_configdir}/base.cfg
 
diff --git a/config/gdb-7.5-1.cfg b/config/gdb-7.5-1.cfg
index 849e6f4..e2d141b 100644
--- a/config/gdb-7.5-1.cfg
+++ b/config/gdb-7.5-1.cfg
@@ -2,16 +2,15 @@
 # GDB 7.5.
 #
 
+%if %{release} == %{nil}
+%define release 1
+%endif
+
 %include %{_configdir}/checks.cfg
 %include %{_configdir}/base.cfg
 
 %define gdb_version 7.5
 
-Name: %{_target}-gdb-%{gdb_version}-%{release}
-
-%description
-Cross gdb for target %{_target}.
-
 #
 # The gdb build instructions. We use 7.xx Release 1.
 #
diff --git a/config/libusb-1-1.cfg b/config/libusb-1-1.cfg
index 259362c..a31f218 100644
--- a/config/libusb-1-1.cfg
+++ b/config/libusb-1-1.cfg
@@ -4,8 +4,8 @@
 # This configuration file configure's, make's and install's libusb.
 #
 
-%ifn %{defined release}
-%error No 'release' defined
+%if %{release} == %{nil}
+%define release 1
 %endif
 
 Summary:   LibUSB v%{libusb_version} for target %{_target} on host %{_host}
diff --git a/config/m4-1-1.cfg b/config/m4-1-1.cfg
index 129d318..64eea18 100644
--- a/config/m4-1-1.cfg
+++ b/config/m4-1-1.cfg
@@ -6,6 +6,8 @@
 # Warning: this package is only for bootstrapping within a build.
 #
 
+
+Name:      m4-%{m4_version}-%{_host}-%{release}
 Summary:   M4 v%{m4_version} for host %{_host}
 Version:   %{m4_version}
 Release:   %{release}
diff --git a/config/m4-1.4.16-1.cfg b/config/m4-1.4.16-1.cfg
index e21d8ed..8753a64 100644
--- a/config/m4-1.4.16-1.cfg
+++ b/config/m4-1.4.16-1.cfg
@@ -2,19 +2,14 @@
 # M4 1.4.16
 #
 
-%ifn %{defined release}
-%error No 'release' defined
+%if %{release} == %{nil}
+%define release 1
 %endif
 
 %include %{_configdir}/base.cfg
 
 %define m4_version 1.4.16
 
-Name: m4-%{m4_version}-%{_host}-%{release}
-
-%description
-M4 for host %{_host}.
-
 #
 # The m4 build instructions. We use 1.x.x Release 1.
 #
diff --git a/config/texane-stlink-1.cfg b/config/texane-stlink-1.cfg
index e58100a..e04c7ad 100644
--- a/config/texane-stlink-1.cfg
+++ b/config/texane-stlink-1.cfg
@@ -4,8 +4,8 @@
 # This configuration file configure's, make's and install's SL-Link.
 #
 
-%ifn %{defined release}
-%error No 'release' defined
+%if %{release} == %{nil}
+%define release 1
 %endif
 
 %include %{_configdir}/base.cfg