diff --git a/common/shlibs b/common/shlibs
index 352038b2e41..6032aa0f190 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -630,7 +630,7 @@ libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.3.9_1
 libnetpgp.so.0 libnetpgp-20100313_1
-libmj.so.0 libnetpgp-20100313_1
+libmj.so.0 libmj-20140211_1
 libmca_common_sm.so.1 openmpi-1.4.1_1
 libmpi_cxx.so.0 openmpi-1.4.1_1
 libmpi.so.0 openmpi-1.4.1_1
diff --git a/srcpkgs/libmj b/srcpkgs/libmj
new file mode 120000
index 00000000000..a53a261b214
--- /dev/null
+++ b/srcpkgs/libmj
@@ -0,0 +1 @@
+netpgp
\ No newline at end of file
diff --git a/srcpkgs/libmj-devel b/srcpkgs/libmj-devel
new file mode 120000
index 00000000000..a53a261b214
--- /dev/null
+++ b/srcpkgs/libmj-devel
@@ -0,0 +1 @@
+netpgp
\ No newline at end of file
diff --git a/srcpkgs/netpgp/patches/asprintf.patch b/srcpkgs/netpgp/patches/asprintf.patch
new file mode 100644
index 00000000000..66cfc57101d
--- /dev/null
+++ b/srcpkgs/netpgp/patches/asprintf.patch
@@ -0,0 +1,12 @@
+_GNU_SOURCE must be defined before including stdio.h for asprintf().
+
+--- src/lib/packet-show.c.orig	2014-02-17 19:39:10.097032026 +0100
++++ src/lib/packet-show.c	2014-02-17 19:39:20.887897122 +0100
+@@ -52,6 +52,7 @@
+  * Creates printable text strings from packet contents
+  *
+  */
++#define _GNU_SOURCE
+ #include "config.h"
+ 
+ #ifdef HAVE_SYS_CDEFS_H
diff --git a/srcpkgs/netpgp/patches/configure.ac.patch b/srcpkgs/netpgp/patches/configure.ac.patch
new file mode 100644
index 00000000000..941545b115a
--- /dev/null
+++ b/srcpkgs/netpgp/patches/configure.ac.patch
@@ -0,0 +1,12 @@
+automake-1.14 freaks out if AM_PROG_AR is not defined.
+
+--- configure.ac.orig	2014-02-17 19:47:41.572637701 +0100
++++ configure.ac	2014-02-17 19:47:54.604474781 +0100
+@@ -14,6 +14,7 @@ AC_CONFIG_HEADER([src/lib/config.h])
+ 
+ AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+ AM_MAINTAINER_MODE
++AM_PROG_AR
+ 
+ AC_CANONICAL_HOST
+ CANONICAL_HOST=$host
diff --git a/srcpkgs/netpgp/patches/define_printflike.patch b/srcpkgs/netpgp/patches/define_printflike.patch
new file mode 100644
index 00000000000..86c91034511
--- /dev/null
+++ b/srcpkgs/netpgp/patches/define_printflike.patch
@@ -0,0 +1,15 @@
+__printflike might not be defined at all :-)
+
+--- src/lib/errors.h.orig	2014-02-17 19:23:32.078758868 +0100
++++ src/lib/errors.h	2014-02-17 19:24:22.046134190 +0100
+@@ -55,6 +55,10 @@
+ 
+ #include <errno.h>
+ 
++#ifndef __printflike
++#define __printflike(n,m)	__attribute__((format(printf,n,m)))
++#endif
++
+ /** error codes */
+ /* Remember to add names to map in errors.c */
+ typedef enum {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index e7d2e52881a..851974f4931 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,49 +1,54 @@
 # Template file for 'netpgp'
 pkgname=netpgp
-version=20101107
-revision=4
+version=20140211
+revision=1
 build_style=gnu-configure
-makedepends="zlib-devel openssl-devel"
+hostmakedepends="automake libtool pkg-config"
+makedepends="zlib-devel bzip2-devel openssl-devel"
 short_desc="PGP signing, verification, encryption and decryption program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 homepage="http://www.netbsd.org"
-distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/$pkgname-$version.tar.gz"
-checksum=a0259f7dc886788386c0d827fdba9ad8e0dfcfab1d602dc29e02ae6cc2f9bab9
-long_desc="
- The netpgp library is a BSD-licensed library for managing PGP keys.
+distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
+checksum=b4a01aaad9ef96734266dafb1060c27e2855319e08f4166e6df507eaf0d5ee91
 
- On top of the library, the netpgp command can digitally sign files and
- verify that the signatures attached to files were signed by a given
- user identifier. netpgp can also encrypt files using the public or
- private keys of users and, in the same manner, decrypt files which
- were encrypted.
+pre_configure() {
+	autoreconf -fi
+}
 
- The netpgpkeys utility can also be used to generate a new key-pair for
- a user. This key is in two parts, the public key (which can be used
- by other people) and a private key.
+libmj_package() {
+	replaces="libnetpgp<20140211"
+	short_desc="Minimalist JSON lightweight data interchange library"
+	pkg_install() {
+		vmove "usr/lib/libmj.so.*"
+	}
+}
 
- In addition to these primary uses, the third way of using netpgp is to
- maintain keyrings. Keyrings are collections of public keys belonging
- to other users. By using other means of identification, it is
- possible to establish the bona fides of other users. Once trust has
- been established, the public key of the other user will be signed.
- The other user's public key can be added to our keyring. The other
- user will add our public key to their keyring."
+libmj-devel_package() {
+	short_desc="Minimalist JSON lightweight data interchange library - development files"
+	depends="libmj>=${version}_${revision}"
+	pkg_install() {
+		vinstall ${wrksrc}/src/libmj/mj.h 644 usr/include
+		vmove usr/lib/libmj.a
+		vmove usr/lib/libmj.so
+		vmove usr/share/man/man3/libmj.3
+	}
+}
 
 libnetpgp_package() {
 	short_desc="BSD licensed library for PGP tasks"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 	}
 }
 
 libnetpgp-devel_package() {
-	depends="zlib-devel bzip2-devel openssl-devel libnetpgp>=${version}"
+	depends="zlib-devel bzip2-devel openssl-devel libnetpgp>=${version}_${revision}"
 	short_desc="BSD licensed library for PGP tasks - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/share/man/man3
 	}
 }