diff --git a/srcpkgs/gcc/libssp-devel.template b/srcpkgs/gcc/libssp-devel.template
new file mode 100644
index 0000000000..b5f98b9ec4
--- /dev/null
+++ b/srcpkgs/gcc/libssp-devel.template
@@ -0,0 +1,29 @@
+# Template file for 'libssp'.
+#
+short_desc="GCC SSP library support"
+long_desc="${long_desc}
+
+ This package contains the Stack Smashing Protection development
+ files provided by GCC."
+
+Add_dependency run glibc-devel
+Add_dependency run libssp
+
+do_install()
+{
+	local triplet=
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		triplet="${xbps_machine}-unknown-linux-gnu"
+	else
+		triplet="${xbps_machine}-pc-linux-gnu"
+	fi
+
+	mkdir -p ${DESTDIR}/usr/lib/gcc/${triplet}/${version}/include
+	mkdir -p ${DESTDIR}/usr/lib
+
+	mv ${SRCPKGDESTDIR}/usr/lib/libssp*.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libssp.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/gcc/${triplet}/${version}/include/ssp \
+		${DESTDIR}/usr/lib/gcc/${triplet}/${version}/include
+}
diff --git a/srcpkgs/gcc/libssp.template b/srcpkgs/gcc/libssp.template
index 32e46fd0c4..e25313b80f 100644
--- a/srcpkgs/gcc/libssp.template
+++ b/srcpkgs/gcc/libssp.template
@@ -1,26 +1,16 @@
 # Template file for 'libssp'.
 #
-short_desc="GCC SSP library support"
+short_desc="GCC SSP shared library support"
 long_desc="${long_desc}
 
- This package contains the Stack Smashing Protection shared/static
- libraries provided by GCC."
+ This package contains the Stack Smashing Protection shared library
+ provided by GCC."
 
+revision=1
 Add_dependency run glibc
 
 do_install()
 {
-	local triplet=
-
-	if [ "${xbps_machine}" = "x86_64" ]; then
-		triplet="${xbps_machine}-unknown-linux-gnu"
-	else
-		triplet="${xbps_machine}-pc-linux-gnu"
-	fi
-
-	mkdir -p ${DESTDIR}/usr/lib/gcc/${triplet}/${version}/include
 	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libssp* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/gcc/${triplet}/${version}/include/ssp \
-		${DESTDIR}/usr/lib/gcc/${triplet}/${version}/include
+	mv ${SRCPKGDESTDIR}/usr/lib/libssp.so.* ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 90c9352615..a4c0b82d5d 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -17,8 +17,8 @@ long_desc="
  The GNU C Compiler suite, with support for C, C++, Fortran, ObjC."
 
 base_chroot=yes
-subpackages="libgcc libssp libstdc++ libstdc++-devel libgomp libmudflap"
-subpackages="${subpackages} libmudflap-devel libobjc libobjc-devel"
+subpackages="libgcc libssp libssp-devel libstdc++ libstdc++-devel libgomp"
+subpackages="${subpackages} libmudflap libmudflap-devel libobjc libobjc-devel"
 subpackages="${subpackages} gcc-c++ gcc-objc gcc-objc++"
 
 Add_dependency full	gmp
@@ -26,8 +26,8 @@ Add_dependency full	mpfr
 Add_dependency full	binutils
 Add_dependency full	cloog-ppl
 Add_dependency run	libgcc
-Add_dependency run	libssp
 Add_dependency run	libgomp
+Add_dependency run	libssp-devel
 Add_dependency run	glibc-devel
 
 # As specified in the LFS book, disable installing libiberty.
diff --git a/srcpkgs/libssp-devel b/srcpkgs/libssp-devel
new file mode 120000
index 0000000000..b08d5af579
--- /dev/null
+++ b/srcpkgs/libssp-devel
@@ -0,0 +1 @@
+gcc
\ No newline at end of file