diff --git a/templates/jpeg-devel b/templates/jpeg-devel
new file mode 120000
index 0000000000..9672109715
--- /dev/null
+++ b/templates/jpeg-devel
@@ -0,0 +1 @@
+jpeg
\ No newline at end of file
diff --git a/templates/jpeg/depends b/templates/jpeg/depends
new file mode 100644
index 0000000000..70254e43fa
--- /dev/null
+++ b/templates/jpeg/depends
@@ -0,0 +1,2 @@
+abi_depends=6b
+api_depends=${abi_depends}
diff --git a/templates/jpeg/devel.template b/templates/jpeg/devel.template
new file mode 100644
index 0000000000..939888ceda
--- /dev/null
+++ b/templates/jpeg/devel.template
@@ -0,0 +1,16 @@
+# Template file for 'jpeg-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run jpeg
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+}
diff --git a/templates/jpeg/jpeg-makefile-cfg.diff b/templates/jpeg/install.diff
similarity index 100%
rename from templates/jpeg/jpeg-makefile-cfg.diff
rename to templates/jpeg/install.diff
diff --git a/templates/jpeg/template b/templates/jpeg/template
index 0508ac0171..3d7efa53ab 100644
--- a/templates/jpeg/template
+++ b/templates/jpeg/template
@@ -1,34 +1,29 @@
 # Template build file for 'jpeg'.
 pkgname=jpeg
-version=6.0b
-wrksrc=$pkgname-6b
-patch_files="$pkgname-makefile-cfg.diff"
-distfiles="
-ftp://ftp.fu-berlin.de/unix/graphics/jpeg/jpegsrc.v6b.tar.gz"
+sourcepkg=$pkgname
+version=6b
+distfiles="ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${version}.tar.gz"
 build_style=gnu_configure
-make_install_target="install install-lib"
+make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr
+ mandir=$XBPS_DESTDIR/$pkgname-$version/usr/share/man/man1 install"
 configure_args="--enable-shared --enable-static"
 short_desc="IJG's jpeg compression utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=18892206014fbb8cae2a44e281f4ed53feaf7882
+checksum=75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
 long_desc="
- The Independent JPEG Group's JPEG software
- ==========================================
+ The jpeg package contains a library of functions for manipulating
+ JPEG images, as well as simple client programs for accessing the
+ libjpeg functions. Libjpeg client programs include cjpeg, djpeg,
+ jpegtran, rdjpgcom and wrjpgcom. Cjpeg compresses an image file into
+ JPEG format.  Djpeg decompresses a JPEG file into a regular image
+ file. Jpegtran can perform various useful transformations on JPEG
+ files. Rdjpgcom displays any text comments included in a JPEG file.
+ Wrjpgcom inserts text comments into a JPEG file."
 
- README for release 6 of 2-Aug-95
- ================================
+subpackages="devel"
+Add_dependency full glibc
 
- This distribution contains the sixth public release of the Independent JPEG
- Group's free JPEG software.  You are welcome to redistribute this software and
- to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
-
- Serious users of this software (particularly those incorporating it into
- larger programs) should contact IJG at jpeg-info@uunet.uu.net to be added to
- our electronic mailing list.  Mailing list members are notified of updates
- and have a chance to participate in technical discussions, etc.
-
- This software is the work of Tom Lane, Philip Gladstone, Luis Ortiz, Jim
- Boucher, Lee Crocker, Julian Minguillon, George Phillips, Davide Rossi,
- Ge' Weijers, and other members of the Independent JPEG Group.
-
- IJG is not affiliated with the official ISO JPEG standards committee."
+post_install()
+{
+	install -D -m644 ${wrksrc}/jpegint.h ${DESTDIR}/usr/include
+}