diff --git a/security/libnettle/Makefile b/security/libnettle/Makefile
index 9006840d14c..f788e091bc5 100644
--- a/security/libnettle/Makefile
+++ b/security/libnettle/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.4 2011/10/12 06:03:41 rpointel Exp $
+# $OpenBSD: Makefile,v 1.5 2012/09/05 07:14:47 ajacoutot Exp $
 
 COMMENT=	cryptographic library
 
-DISTNAME=	nettle-2.4
+DISTNAME=	nettle-2.5
 PKGNAME=	lib${DISTNAME}
 
-SHARED_LIBS +=  hogweed                   0.2 # 2.4
-SHARED_LIBS +=  nettle                    0.2 # 4.3
+SHARED_LIBS +=  hogweed                   1.0 # 2.4
+SHARED_LIBS +=  nettle                    1.0 # 4.3
 
 CATEGORIES=	security devel
 
diff --git a/security/libnettle/distinfo b/security/libnettle/distinfo
index 81b39a6f686..59fc52c71c2 100644
--- a/security/libnettle/distinfo
+++ b/security/libnettle/distinfo
@@ -1,5 +1,2 @@
-MD5 (nettle-2.4.tar.gz) = RQvoxIhtRsCfSfVorW+gEw==
-RMD160 (nettle-2.4.tar.gz) = hIDhDOcY2xooDVeoCKeKTPqUDRw=
-SHA1 (nettle-2.4.tar.gz) = HfDNAT6D9zt4pVIUEaZ+Mx3j36Y=
-SHA256 (nettle-2.4.tar.gz) = pgCSCN9ogfdaoahwgcz7LMrBiE2hBnDFPXt2WW9knD8=
-SIZE (nettle-2.4.tar.gz) = 1075789
+SHA256 (nettle-2.5.tar.gz) = SqFC6QiwBTCC13KfwBVdyQ2+ccjvX1DzADSAXtXJLHI=
+SIZE (nettle-2.5.tar.gz) = 1113274
diff --git a/security/libnettle/patches/patch-Makefile_in b/security/libnettle/patches/patch-Makefile_in
index 4f0c2aa4695..41c83660753 100644
--- a/security/libnettle/patches/patch-Makefile_in
+++ b/security/libnettle/patches/patch-Makefile_in
@@ -1,22 +1,27 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2011/08/25 09:20:27 ajacoutot Exp $
---- Makefile.in.orig	Mon Jul 11 15:59:25 2011
-+++ Makefile.in	Thu Aug 25 11:03:41 2011
-@@ -277,18 +277,10 @@ install-static: $(LIBTARGETS)
- install-shared-nettle: $(LIBNETTLE_FORLINK)
+$OpenBSD: patch-Makefile_in,v 1.3 2012/09/05 07:14:47 ajacoutot Exp $
+--- Makefile.in.orig	Sat Jul  7 15:27:54 2012
++++ Makefile.in	Mon Sep  3 13:56:47 2012
+@@ -318,11 +318,6 @@ install-dll-nettle:
+ install-shared-nettle: $(LIBNETTLE_FORLINK) @IF_DLL@ install-dll-nettle
  	$(MKDIR_P) $(DESTDIR)$(libdir)
- 	$(INSTALL_DATA) $(LIBNETTLE_FORLINK) $(DESTDIR)$(libdir)/$(LIBNETTLE_FILE)
+ 	$(INSTALL_DATA) $(LIBNETTLE_FILE_SRC) $(DESTDIR)$(libdir)/$(LIBNETTLE_FILE)
 -	[ -z "$(LIBNETTLE_SONAME)" ] \
 -                || (cd $(DESTDIR)$(libdir) \
--		&& ln -sf $(LIBNETTLE_FILE) $(LIBNETTLE_SONAME) \
--		&& ln -sf $(LIBNETTLE_FILE) $(LIBNETTLE_FORLINK))
+-		&& rm -f $(LIBNETTLE_SONAME) $(LIBNETTLE_FORLINK) \
+-		&& $(LN_S) $(LIBNETTLE_FILE) $(LIBNETTLE_SONAME) \
+-		&& $(LN_S) $(LIBNETTLE_FILE) $(LIBNETTLE_FORLINK))
  
- install-shared-hogweed: $(LIBHOGWEED_FORLINK)
+ install-dll-hogweed:
+ 	$(MKDIR_P) $(DESTDIR)$(bindir)
+@@ -331,11 +326,6 @@ install-dll-hogweed:
+ install-shared-hogweed: $(LIBHOGWEED_FORLINK) @IF_DLL@ install-dll-hogweed
  	$(MKDIR_P) $(DESTDIR)$(libdir)
- 	$(INSTALL_DATA) $(LIBHOGWEED_FORLINK) $(DESTDIR)$(libdir)/$(LIBHOGWEED_FILE)
+ 	$(INSTALL_DATA) $(LIBHOGWEED_FILE_SRC) $(DESTDIR)$(libdir)/$(LIBHOGWEED_FILE)
 -	[ -z "$(LIBHOGWEED_SONAME)" ] \
 -                || (cd $(DESTDIR)$(libdir) \
--		&& ln -sf $(LIBHOGWEED_FILE) $(LIBHOGWEED_SONAME) \
--		&& ln -sf $(LIBHOGWEED_FILE) $(LIBHOGWEED_FORLINK))
+-		&& rm -f $(LIBHOGWEED_SONAME) $(LIBHOGWEED_FORLINK) \
+-		&& $(LN_S) $(LIBHOGWEED_FILE) $(LIBHOGWEED_SONAME) \
+-		&& $(LN_S) $(LIBHOGWEED_FILE) $(LIBHOGWEED_FORLINK))
  
  # I'd like to use makes VPATH search to locate the files to be
  # installed. But it seems most make programs don't set $<, $^, $? and
diff --git a/security/libnettle/pkg/PLIST b/security/libnettle/pkg/PLIST
index 4c99bb2f61f..f2d99d58cbf 100644
--- a/security/libnettle/pkg/PLIST
+++ b/security/libnettle/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/10/12 06:03:41 rpointel Exp $
+@comment $OpenBSD: PLIST,v 1.4 2012/09/05 07:14:47 ajacoutot Exp $
 %%SHARED%%
 @bin bin/nettle-hash
 @bin bin/nettle-lfib-stream
@@ -39,6 +39,7 @@ include/nettle/realloc.h
 include/nettle/ripemd160.h
 include/nettle/rsa-compat.h
 include/nettle/rsa.h
+include/nettle/salsa20.h
 include/nettle/serpent.h
 include/nettle/sexp.h
 include/nettle/sha.h