diff --git a/misc/openr2/Makefile b/misc/openr2/Makefile
index 4ba9b6b2a5fb..4d81a9929677 100644
--- a/misc/openr2/Makefile
+++ b/misc/openr2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openr2
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -12,7 +13,15 @@ COMMENT=	MFC/R2 call setup library
 BUILD_DEPENDS=	${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CPPFLAGS+=	-I${LOCALBASE}/include
+INSTALL_TARGET=	install-strip
+USES=		libtool
 USE_LDCONFIG=	yes
 
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/etc/r2proto.conf \
+		${STAGEDIR}${PREFIX}/etc/r2proto.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/r2test.conf \
+		${STAGEDIR}${PREFIX}/etc/r2test.conf.sample
+
 .include <bsd.port.mk>
diff --git a/misc/openr2/files/patch-Makefile.in b/misc/openr2/files/patch-Makefile.in
deleted file mode 100644
index 00afd72d6b48..000000000000
--- a/misc/openr2/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	2012-06-26 19:49:39.000000000 +0700
-+++ Makefile.in	2012-06-26 19:50:31.000000000 +0700
-@@ -370,8 +370,8 @@
- 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \
-+	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f-dist"; \
- 	done
- 
- uninstall-dist_sysconfDATA:
diff --git a/misc/openr2/pkg-plist b/misc/openr2/pkg-plist
index 49ff4acf8c75..a2bdd621e1cb 100644
--- a/misc/openr2/pkg-plist
+++ b/misc/openr2/pkg-plist
@@ -1,12 +1,7 @@
 bin/r2dtmf_detect
 bin/r2test
-@unexec if cmp -s %D/etc/r2proto.conf %D/etc/r2proto.conf-dist; then rm -f %D/etc/r2proto.conf; fi
-etc/r2proto.conf-dist
-@exec if test ! -e %D/etc/r2proto.conf; then cp -p %D/etc/r2proto.conf-dist %D/etc/r2proto.conf; fi
-@unexec if cmp -s %D/etc/r2test.conf %D/etc/r2test.conf-dist; then rm -f %D/etc/r2test.conf; fi
-etc/r2test.conf-dist
-@exec if test ! -e %D/etc/r2test.conf; then cp -p %D/etc/r2test.conf-dist %D/etc/r2test.conf; fi
-@exec false
+@sample etc/r2proto.conf.sample
+@sample etc/r2test.conf.sample
 include/openr2.h
 include/openr2/r2chan.h
 include/openr2/r2context.h
@@ -14,9 +9,9 @@ include/openr2/r2log.h
 include/openr2/r2proto.h
 include/openr2/r2utils.h
 lib/libopenr2.a
-lib/libopenr2.la
 lib/libopenr2.so
-lib/libopenr2.so.4
+lib/libopenr2.so.3
+lib/libopenr2.so.3.1.1
 man/man5/r2test.conf.5.gz
 man/man8/r2test.8.gz
 @dirrm include/openr2
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 315d349add7e..04727c6d7767 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.8.29.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index afe3aafe82dd..55a3aed9c72a 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	11.11.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/