diff --git a/packages/main/slurm-llnl-2.2.1/debian/control b/packages/main/slurm-llnl-2.2.1/debian/control
index 1918044..f707cba 100644
--- a/packages/main/slurm-llnl-2.2.1/debian/control
+++ b/packages/main/slurm-llnl-2.2.1/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: Gennaro Oliva <oliva.g@na.icar.cnr.it>
 Uploaders: Dirk Eddelbuettel <edd@debian.org>
-Build-Depends: debhelper (>= 7.0.0), autotools-dev, libmunge-dev, libncurses5-dev, libssl-dev, po-debconf, python, libglade2-dev, libgtk2.0-dev, libmysqlclient-dev, postgresql-server-dev-8.4, libpam0g-dev
+Build-Depends: debhelper (>= 7.0.0), autotools-dev, libmunge-dev, libncurses5-dev, libssl-dev, po-debconf, python, libglade2-dev, libgtk2.0-dev, libmysqlclient-dev, postgresql-server-dev-8.4, libpam0g-dev, libperl-dev, chrpath
 Standards-Version: 3.9.1
 Homepage: https://computing.llnl.gov/linux/slurm/
 
@@ -119,3 +119,33 @@ Description: Secure enterprise-wide interface to a database for SLURM
  used to securely manage the accounting data for several Slurm
  clusters in a central location and sacctmgr a command for managing
  user accounts in SlurmDBD.
+
+Package: libslurm-perl
+Section: perl
+Architecture: any
+Depends: ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Description: Perl API for SLURM
+ SLURM, the Simple Linux Utility for Resource Management,
+ is an open-source cluster resource management and job scheduling.
+ .
+ This package contains the Perl module.
+
+Package: libslurmdb-perl
+Section: perl
+Architecture: any
+Depends: ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Description: Perl API for the SLURM database
+ SLURM, the Simple Linux Utility for Resource Management,
+ is an open-source cluster resource management and job scheduling.
+ .
+ This package contains the Perl module for the SLURM database.
+
+Package: slurm-llnl-torque
+Architecture: all
+Depends: libslurm-perl (>= ${source:Version}), libslurmdb-perl (>= ${source:Version}), ${perl:Depends}, ${misc:Depends}, slurm-llnl (>= ${source:Version})
+Description: Torque compatibility wrappers for SLURM
+ SLURM, the Simple Linux Utility for Resource Management,
+ is an open-source cluster resource management and job scheduling.
+ .
+ This package contains the Torque compatibility wrappers.
+
diff --git a/packages/main/slurm-llnl-2.2.1/debian/libslurmdb-perl.dirs b/packages/main/slurm-llnl-2.2.1/debian/libslurmdb-perl.dirs
new file mode 100644
index 0000000..c3b2552
--- /dev/null
+++ b/packages/main/slurm-llnl-2.2.1/debian/libslurmdb-perl.dirs
@@ -0,0 +1,2 @@
+usr/share/man/man3
+usr/lib/perl5/auto
diff --git a/packages/main/slurm-llnl-2.2.1/debian/rules b/packages/main/slurm-llnl-2.2.1/debian/rules
index bccb7cd..35b6b7a 100755
--- a/packages/main/slurm-llnl-2.2.1/debian/rules
+++ b/packages/main/slurm-llnl-2.2.1/debian/rules
@@ -60,7 +60,11 @@ clean:
 	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
 
 	# Add here commands to clean up after the build process.
+	[ ! -f contribs/perlapi/Makefile ] || $(MAKE) -C contribs/perlapi distclean
+	[ ! -f contribs/torque/Makefile ] || $(MAKE) -C contribs/torque distclean
 	[ ! -f Makefile ] || $(MAKE) distclean
+
+
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	  cp -f /usr/share/misc/config.sub config.sub
   endif
@@ -73,16 +77,23 @@ ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 
   install: install-indep install-arch
   install-indep:
-	  dh_testdir
-	  dh_testroot
-	  dh_prep -i 
-	  dh_installdirs -i
-	  $(MAKE) -C doc/html install DESTDIR=$(CURDIR)/debian/slurm-llnl-doc
-	  dh_install -pslurm-llnl-doc debian/slurm-llnl-doc/usr/share/doc/slurm-[0-9]*/html usr/share/doc/slurm-llnl-doc
-	  #Install documenation packages file
-	  rm -rf debian/slurm-llnl-doc/usr/share/doc/slurm-[0-9]*
+	dh_testdir
+	dh_testroot
+	dh_prep -i 
+	dh_installdirs -i
+	$(MAKE) -C doc/html install DESTDIR=$(CURDIR)/debian/slurm-llnl-doc
+	dh_install -pslurm-llnl-doc debian/slurm-llnl-doc/usr/share/doc/slurm-[0-9]*/html usr/share/doc/slurm-llnl-doc
+	#Install documenation packages file
+	rm -rf debian/slurm-llnl-doc/usr/share/doc/slurm-[0-9]*
+
+	$(MAKE) -C contribs/torque install DESTDIR=$(CURDIR)/debian/slurm-llnl-torque
+	rm -f debian/slurm-llnl-torque/usr/bin/mpiexec
 
-	  dh_install -i
+	for i in debian/slurm-llnl-torque/usr/bin/*; do \
+		pod2man $$i > debian/slurm-llnl-torque/usr/share/man/man1/$$(basename $$i).1; \
+	done
+
+	dh_install -i
 
   install-arch:
 	dh_testdir
@@ -166,6 +177,16 @@ ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	rm -f debian/slurm-llnl/usr/share/man/man1/sacctmgr.1
 
 	rmdir debian/slurm-llnl/usr/lib
+
+	# Perl
+	$(MAKE) -C contribs/perlapi install DESTDIR=$(CURDIR)/debian/libslurm-perl PERL_MM_OPT="INSTALLDIRS=vendor"
+
+	find debian/libslurm-perl -type f -name "*.so" | xargs chrpath -d
+
+	mv debian/libslurm-perl/usr/lib/perl5/Slurmdb.pm debian/libslurmdb-perl/usr/lib/perl5/
+	mv debian/libslurm-perl/usr/lib/perl5/auto/Slurmdb debian/libslurmdb-perl/usr/lib/perl5/auto
+	mv debian/libslurm-perl/usr/share/man/man3/Slurmdb.3pm debian/libslurmdb-perl/usr/share/man/man3
+
 	dh_install -s
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
@@ -188,6 +209,7 @@ binary-common:
 	dh_compress -X.pdf -X.example
 	dh_strip
 	dh_fixperms
+	dh_perl
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
diff --git a/packages/main/slurm-llnl-2.2.1/debian/slurm-llnl-torque.dirs b/packages/main/slurm-llnl-2.2.1/debian/slurm-llnl-torque.dirs
new file mode 100644
index 0000000..98d1583
--- /dev/null
+++ b/packages/main/slurm-llnl-2.2.1/debian/slurm-llnl-torque.dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man/man1
