diff --git a/mail/mixmaster/Makefile b/mail/mixmaster/Makefile
index 61f1de20cbcd..9f10d8030d63 100644
--- a/mail/mixmaster/Makefile
+++ b/mail/mixmaster/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	mixmaster
 PORTVERSION=	3.0.2d
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.c-s.li/ports/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -20,7 +21,7 @@ USE_NCURSES=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/Mix/Src
 
-PORTDOCS=	README HISTORY
+PORTDOCS=	README HISTORY THANKS TODO
 CONFIG_FILES=	abuse.txt.in dest.blk mix.cfg news.hlp pubring.mix type1.hlp \
 		adminkey.txt end.hlp mix.cfg.ex pgp.hlp rab.blk usage.txt.in \
 		blocked.txt.in header.blk mix.hlp pgponly.hlp reply.txt.in \
@@ -63,10 +64,8 @@ do-install:
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/Mix/,} ${STAGEDIR}${DOCSDIR}/
 .endif
 .for FILE in ${CONFIG_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/Mix/conf/${FILE} ${ETCDIR}/${FILE}.sample
-	@if [ ! -f ${ETCDIR}/${FILE} ]; then \
-		${CP} -p ${WRKSRC}/Mix/conf/${FILE} ${ETCDIR}/${FILE} ; \
-	fi
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/Mix/conf/${FILE} ${STAGEDIR}${ETCDIR}/${FILE}.sample
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/mail/mixmaster/files/patch-Mix-Src-Makefile.in b/mail/mixmaster/files/patch-Mix-Src-Makefile.in
index caf98abcef16..dd6d23540b73 100644
--- a/mail/mixmaster/files/patch-Mix-Src-Makefile.in
+++ b/mail/mixmaster/files/patch-Mix-Src-Makefile.in
@@ -1,5 +1,5 @@
---- Mix/Src/Makefile.in.orig	2014-06-01 22:58:49.000000000 +0200
-+++ Mix/Src/Makefile.in	2014-06-01 23:00:44.000000000 +0200
+--- Mix/Src/Makefile.in.orig	2014-05-01 10:06:28.000000000 +0200
++++ Mix/Src/Makefile.in	2014-06-16 23:47:09.000000000 +0200
 @@ -8,10 +8,10 @@
  # $Id: Makefile.in 647 2003-10-25 23:34:13Z weasel $
  
@@ -9,7 +9,7 @@
 -LIBS = %LIBS
 -LDFLAGS = %LDFLAGS
 +INC = -I/usr/local/include -I/usr/include
-+DEF = -DUSE_ZLIB -DUSE_PCRE -DUSE_AES -DUSE_NCURSES -DHAVE_NCURSES_H -DUSE_IDEA -DHAVE_SETENV -DUSE_SOCK -DSPOOL='"/tmp/mixmaster"' -DGLOBALMIXCONF='"%%ETCDIR%%/mix.cfg"' -DHOMEMIXDIR='".Mix"'
++DEF = -DUSE_ZLIB -DUSE_PCRE -DUSE_AES -DUSE_NCURSES -DHAVE_NCURSES_H -DUSE_IDEA -DHAVE_SETENV -DUSE_SOCK -DGLOBALMIXCONF='"/usr/local/etc/mixmaster/mix.cfg"' -DHOMEMIXDIR='".Mix"'
 +LIBS =
 +LDFLAGS = -Wl -lz -lpcre -L/usr/local/lib -lncurses -ltermcap -lcrypto
  
diff --git a/mail/mixmaster/files/patch-Mix-Src-config.h b/mail/mixmaster/files/patch-Mix-Src-config.h
index df63662883d9..57923b10cc72 100644
--- a/mail/mixmaster/files/patch-Mix-Src-config.h
+++ b/mail/mixmaster/files/patch-Mix-Src-config.h
@@ -1,5 +1,5 @@
---- Mix/Src/config.h.orig	2014-06-01 23:03:49.000000000 +0200
-+++ Mix/Src/config.h	2014-06-01 23:04:46.000000000 +0200
+--- Mix/Src/config.h.orig	2014-05-01 10:06:28.000000000 +0200
++++ Mix/Src/config.h	2014-06-16 17:41:37.000000000 +0200
 @@ -179,11 +179,11 @@
  #define BUFSIZE 4096
  
@@ -14,3 +14,12 @@
  #endif
  
  /** file names ********************************************************/
+@@ -241,7 +241,7 @@
+ #define DEFAULT_STAREX "starex.txt"
+ #define DEFAULT_ALLPINGERSURL "http://www.noreply.org/allpingers/allpingers.txt"
+ #define DEFAULT_ALLPINGERSFILE "allpingers.txt"
+-#define DEFAULT_WGET "wget"
++#define DEFAULT_WGET "/usr/bin/fetch"
+ 
+ DLLIMPORT extern char MIXCONF[];
+ extern char DISCLAIMFILE[];
diff --git a/mail/mixmaster/files/patch-Mix-Src-menustats.c b/mail/mixmaster/files/patch-Mix-Src-menustats.c
new file mode 100644
index 000000000000..ea44f9d4100a
--- /dev/null
+++ b/mail/mixmaster/files/patch-Mix-Src-menustats.c
@@ -0,0 +1,11 @@
+--- Mix/Src/menustats.c.orig	2014-06-16 23:20:42.000000000 +0200
++++ Mix/Src/menustats.c	2014-06-16 23:20:58.000000000 +0200
+@@ -57,7 +57,7 @@
+           narg[0]=WGET;
+           narg[1]="-q";
+           narg[2]=url;
+-          narg[3]="-O";
++          narg[3]="-o";
+           narg[4]=dest;
+           narg[5]=(char *) 0;
+           execvp(WGET, narg);
diff --git a/mail/mixmaster/files/patch-Mix-conf-mix.cfg b/mail/mixmaster/files/patch-Mix-conf-mix.cfg
index 5ae3af7e2889..890602adfde1 100644
--- a/mail/mixmaster/files/patch-Mix-conf-mix.cfg
+++ b/mail/mixmaster/files/patch-Mix-conf-mix.cfg
@@ -1,8 +1,7 @@
---- Mix/conf/mix.cfg.orig	2014-06-01 23:07:26.000000000 +0200
-+++ Mix/conf/mix.cfg	2014-06-01 23:07:48.000000000 +0200
-@@ -12,3 +12,5 @@
+--- Mix/conf/mix.cfg.orig	2014-06-16 23:58:04.000000000 +0200
++++ Mix/conf/mix.cfg	2014-06-16 23:58:55.000000000 +0200
+@@ -12,3 +12,4 @@
  RELFINAL	99
  MAXLAT		36h
  MINLAT		5m
 +SENDMAIL        /usr/sbin/sendmail -t
-+POOL            /var/spool/mixmaster
diff --git a/mail/mixmaster/pkg-descr b/mail/mixmaster/pkg-descr
index 1d076df6951b..e06c8d337675 100644
--- a/mail/mixmaster/pkg-descr
+++ b/mail/mixmaster/pkg-descr
@@ -2,7 +2,4 @@ Mixmaster is an "Chaumian mix-net" anonymous remailer. Remailers provide
 protection against traffic analysis and allow sending email anonymously or
 pseudonymously. 
 
-This software comes in a client only configuration! If you want to setup a
-mixmaster server, read through the example files and man page.
-
 WWW: https://github.com/crooks/mixmaster
diff --git a/mail/mixmaster/pkg-message b/mail/mixmaster/pkg-message
new file mode 100644
index 000000000000..6d982685e9da
--- /dev/null
+++ b/mail/mixmaster/pkg-message
@@ -0,0 +1,15 @@
+
+******************************************************************************
+
+To use mixmaster as a client for sending anonymous e-mails, do the following:
+
+1) As a normal user (not root) create the .Mix directory:
+	mkdir ~/.Mix
+2) Update the list of remailers regularly, e.g.:
+	mixmaster-update --source austria
+3) Start mixmaster:
+	mixmaster
+
+USE AT YOUR OWN RISK!  DON'T USE IT FOR SPAM OR HARASSMENT OF OTHERS!
+
+******************************************************************************
diff --git a/mail/mixmaster/pkg-plist b/mail/mixmaster/pkg-plist
index 4dd2a62806c8..825eb01029f0 100644
--- a/mail/mixmaster/pkg-plist
+++ b/mail/mixmaster/pkg-plist
@@ -2,5 +2,29 @@ bin/mixmaster
 bin/mixmaster-update
 bin/mpgp
 bin/remailer
+@sample %%ETCDIR%%/abuse.txt.in.sample
+@sample %%ETCDIR%%/adminkey.txt.sample
+@sample %%ETCDIR%%/allpingers.txt.sample
+@sample %%ETCDIR%%/blocked.txt.in.sample
+@sample %%ETCDIR%%/dest.alw.sample
+@sample %%ETCDIR%%/dest.blk.sample
+@sample %%ETCDIR%%/end.hlp.sample
+@sample %%ETCDIR%%/header.blk.sample
+@sample %%ETCDIR%%/intro.hlp.sample
+@sample %%ETCDIR%%/mix.cfg.ex.sample
+@sample %%ETCDIR%%/mix.cfg.sample
+@sample %%ETCDIR%%/mix.hlp.sample
+@sample %%ETCDIR%%/mlist.txt.sample
+@sample %%ETCDIR%%/news.hlp.sample
+@sample %%ETCDIR%%/pgp.hlp.sample
+@sample %%ETCDIR%%/pgponly.hlp.sample
+@sample %%ETCDIR%%/pubring.asc.sample
+@sample %%ETCDIR%%/pubring.mix.sample
+@sample %%ETCDIR%%/rab.blk.sample
+@sample %%ETCDIR%%/reply.txt.in.sample
+@sample %%ETCDIR%%/rlist.txt.sample
+@sample %%ETCDIR%%/type1.hlp.sample
+@sample %%ETCDIR%%/usage.txt.in.sample
 man/man1/mixmaster.1.gz
 man/man1/mpgp.1.gz
+@dirrmtry %%ETCDIR%%