diff --git a/ap/dssp/dssp-2.2.1.tgz.sha1 b/ap/dssp/dssp-2.2.1.tgz.sha1
new file mode 100644
index 00000000..777a54fe
--- /dev/null
+++ b/ap/dssp/dssp-2.2.1.tgz.sha1
@@ -0,0 +1 @@
+b0fe1b2a4c5c04efaac9f89442fa6f2947ff75b7  dssp-2.2.1.tgz
diff --git a/ap/dsspcmbi/dsspcmbi.SlackBuild b/ap/dssp/dssp.SlackBuild
similarity index 74%
rename from ap/dsspcmbi/dsspcmbi.SlackBuild
rename to ap/dssp/dssp.SlackBuild
index 5c7260ca..4b4b7fd7 100755
--- a/ap/dsspcmbi/dsspcmbi.SlackBuild
+++ b/ap/dssp/dssp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Build script for Slackware
-# Copyright 2008,2009 Damien Goutte-Gattat
+# Copyright 2008,2009,2013 Damien Goutte-Gattat
 #
 # Redistribution and use of this script, with or without modifications,
 # is permitted provided that the following conditions are met:
@@ -26,15 +26,16 @@
 # <http://swift.cmbi.ru.nl/gv/dssp/>.
 
 # Source package infos
-NAMESRC=${NAMESRC:-dsspcmbi}
-VERSION=${VERSION:-20000401}
-ARCHIVE=${ARCHIVE:-$NAMESRC.zip}
-WGET=${WGET:-ftp://ftp.cmbi.ru.nl/pub/molbio/software/$ARCHIVE}
+NAMESRC=${NAMESRC:-dssp}
+VERSION=${VERSION:-2.2.1}
+ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tgz}
+WGET=${WGET:-ftp://ftp.cmbi.ru.nl/pub/software/dssp/$ARCHIVE}
 
 # Build infos
-NAMEPKG=${NAMEPKG:-dsspcmbi}
-BUILD=${BUILD:-3GGD}
-ARCH=${ARCH:-i486}
+NAMEPKG=${NAMEPKG:-dssp}
+BUILD=${BUILD:-1GGD}
+ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
+JOBS=${JOBS:-1}
 EXT=${EXT:-txz}
 
 # Directories
@@ -74,26 +75,23 @@ if [ ! -r $ARCHIVE ]; then
     mv $ARCHIVE.part $ARCHIVE
 fi
 sha1sum -c $ARCHIVE.sha1
+NAME=$(tar ft $ARCHIVE | head -n 1 | cut -d / -f 1)
 
 # Compile
 cd $TMP
 echo "Building $ARCHIVE..."
-unzip $CWD/$ARCHIVE
-cd dssp
-rm dsspcmbi
-gcc -c $CPUOPT -Wall -DGCC \
-  AccSurf.c CalcAccSurf.c Contacts.c Date.c DsspCMBI.c Vector.c p2clib.c
-gcc -o dsspcmbi -s *.o -lm
+tar xf $CWD/$ARCHIVE
+cd $NAME
+echo "BOOST_LIB_SUFFIX =" > make.config
+sed -i 's/-static//' makefile
+make -j $JOBS
 
 # Install
-mkdir -p $PKG/usr/bin
-install -m 755 dsspcmbi $PKG/usr/bin
-ln -sv /usr/bin/dsspcmbi $PKG/usr/bin/dssp
-
-# Install the documentation
-mkdir -p $PKG/usr/doc/$NAMESRC-$VERSION
-install -m 644 \
-  COPYRIGHT README.TXT index.html \
+mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/doc/$NAME
+install -s -m 755 mkdssp $PKG/usr/bin/mkdssp
+install    -m 644 doc/mkdssp.1 $PKG/usr/man/man1/mkdssp.1
+gzip -9 $PKG/usr/man/man1/mkdssp.1
+install -m 644 LICENSE_1_0.txt README.txt changelog \
   $PKG/usr/doc/$NAMESRC-$VERSION
 
 # Copy slack-desc file
@@ -106,7 +104,7 @@ PACKAGING="
 chown root:root . -R
 /sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSION-$ARCH-$BUILD.$EXT
 rm -rf $PKG
-rm -rf $TMP/dssp
+rm -rf $TMP/$NAME
 "
 if type -p fakeroot ; then
     echo "$PACKAGING" | fakeroot
diff --git a/ap/dssp/slack-desc b/ap/dssp/slack-desc
new file mode 100644
index 00000000..0627a032
--- /dev/null
+++ b/ap/dssp/slack-desc
@@ -0,0 +1,12 @@
+    |-----handy-ruler------------------------------------------------------|
+dssp: dssp (protein structure prediction program)
+dssp: 
+dssp: DSSP defines secondary structure and solvent exposure of proteins
+dssp: from atomic coordinates as given in Protein Data Bank format.
+dssp: 
+dssp: W. Kabsch and C. Sander (1983), BioPolymers 22:2577-2637
+dssp: 
+dssp: 
+dssp: 
+dssp: 
+dssp: 
diff --git a/ap/dsspcmbi/dsspcmbi.zip.sha1 b/ap/dsspcmbi/dsspcmbi.zip.sha1
deleted file mode 100644
index 877d17d9..00000000
--- a/ap/dsspcmbi/dsspcmbi.zip.sha1
+++ /dev/null
@@ -1 +0,0 @@
-de348eea9be2d67ec33f9dc6346fd966e4bb538a  dsspcmbi.zip
diff --git a/ap/dsspcmbi/slack-desc b/ap/dsspcmbi/slack-desc
deleted file mode 100644
index 1cb4941c..00000000
--- a/ap/dsspcmbi/slack-desc
+++ /dev/null
@@ -1,12 +0,0 @@
-        |-----handy-ruler------------------------------------------------------|
-dsspcmbi: dsspcmbi (protein structure prediction program)
-dsspcmbi: 
-dsspcmbi: DSSP defines secondary structure and solvent exposure of proteins
-dsspcmbi: from atomic coordinates as given in Protein Data Bank format.
-dsspcmbi: 
-dsspcmbi: W. Kabsch and C. Sander (1983), BioPolymers 22:2577-2637
-dsspcmbi: 
-dsspcmbi: This is the version of the Centre for Molecular and Biomolecular
-dsspcmbi: Informatics (CMBI) of Netherlands. Restrictions: commercial users
-dsspcmbi: must apply for a licence; not to be used for classified research.
-dsspcmbi: