diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index dc9d9cb02ae..24d89dacf70 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2006/08/04 00:10:42 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2007/03/18 17:19:57 martynas Exp $
 
 COMMENT=	"text mode rss newsreader"
 DISTNAME=	snownews-1.5.7
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}download/
 
@@ -24,14 +24,9 @@ MODULES=	devel/gettext
 
 LIB_DEPENDS+=	xml2.>=7.10::textproc/libxml
 
-MAKE_ENV+=	EXTRA_LDFLAGS="-lintl -liconv" INSTALL=install \
-	EXTRA_CFLAGS="-DSTATIC_CONST_ICONV -I${LOCALBASE}/include ${CFLAGS}"
+MAKE_ENV+=	EXTRA_CFLAGS="${CFLAGS}"
 
-FAKE_FLAGS=	DESTDIR=
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snownews
-	${INSTALL_DATA} ${WRKSRC}/README{,.patching,.de} \
-		${PREFIX}/share/doc/snownews
+CONFIGURE_STYLE= simple
+CONFIGURE_ARGS=	 --prefix=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/www/snownews/patches/patch-Makefile b/www/snownews/patches/patch-Makefile
index 3a5f0fbe089..4f5ec36c452 100644
--- a/www/snownews/patches/patch-Makefile
+++ b/www/snownews/patches/patch-Makefile
@@ -1,9 +1,9 @@
-$OpenBSD: patch-Makefile,v 1.9 2006/02/20 16:33:55 naddy Exp $
+$OpenBSD: patch-Makefile,v 1.10 2007/03/18 17:19:57 martynas Exp $
 --- Makefile.orig	Sun Jun  5 11:50:22 2005
 +++ Makefile	Thu Feb 16 22:15:51 2006
 @@ -1,4 +1,4 @@
 -CC=         gcc
-+#CC=         gcc
++CC?=        gcc
  MAKE=       make
  INSTALL=    install
  LOCALEPATH= $(PREFIX)/share/locale
@@ -16,26 +16,3 @@ $OpenBSD: patch-Makefile,v 1.9 2006/02/20 16:33:55 naddy Exp $
  
  VERSION= `grep VERSION version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
  DISTDIR= snownews-$(VERSION)
-@@ -42,11 +42,11 @@ locales:
- 	done
- 
- manpages:
--	cat $(MAN)/snownews.1.in | sed s#PREFIX#$(PREFIX)# | \
-+	cat $(MAN)/snownews.1.in | sed s#PREFIX#$(TRUEPREFIX)# | \
- 	sed s/VERSION/$(VERSION)/ > $(MAN)/snownews.1
- 	
- 	for L in $(LANGS); do \
--		cat $(MAN)/$$L/snownews.1.$$L.in | sed s#PREFIX#$(PREFIX)# | \
-+		cat $(MAN)/$$L/snownews.1.$$L.in | sed s#PREFIX#$(TRUEPREFIX)# | \
- 		sed s/VERSION/$(VERSION)/ > $(MAN)/$$L/snownews.1; \
- 	done
- 
-@@ -59,7 +59,7 @@ install-bin: snownews
- 	if [ ! -d "$(DESTDIR)$(PREFIX)/bin" ]; then \
- 		mkdir -p $(DESTDIR)$(PREFIX)/bin; \
- 	fi
--	$(INSTALL) -s snownews $(DESTDIR)$(PREFIX)/bin
-+	$(INSTALL) snownews $(DESTDIR)$(PREFIX)/bin
- 	$(INSTALL) opml2snow $(DESTDIR)$(PREFIX)/bin
- 	if [ ! -f "$(DESTDIR)$(PREFIX)/bin/snow2opml" ]; then \
- 		ln -sf $(DESTDIR)$(PREFIX)/bin/opml2snow $(DESTDIR)$(PREFIX)/bin/snow2opml; \
diff --git a/www/snownews/patches/patch-configure b/www/snownews/patches/patch-configure
new file mode 100644
index 00000000000..13cedff29b9
--- /dev/null
+++ b/www/snownews/patches/patch-configure
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.1 2007/03/18 17:19:57 martynas Exp $
+--- configure.orig	Sun Jun  5 12:50:22 2005
++++ configure	Sun Mar 18 18:28:08 2007
+@@ -5,7 +5,7 @@ use strict;
+ 
+ # The defaults. Change here if you need.
+ my($prefix) = "/usr/local";
+-my($cflags) = '-Wall -Wno-format-y2k -O2 -DLOCALEPATH="\"$(LOCALEPATH)\"" -DOS=\"$(shell uname)\" `xml2-config --cflags` $(EXTRA_CFLAGS) ';
++my($cflags) = '-Wall -Wno-format-y2k -DLOCALEPATH="\"$(LOCALEPATH)\"" -DOS=\"$(shell uname)\" `xml2-config --cflags` $(EXTRA_CFLAGS) ';
+ my($ldflags) = '-lncurses `xml2-config --libs` $(EXTRA_LDFLAGS) ';
+ 
+ parse_cmdl_line();
diff --git a/www/snownews/patches/patch-conversions_c b/www/snownews/patches/patch-conversions_c
index be3e1c3315f..53ea0f58e9b 100644
--- a/www/snownews/patches/patch-conversions_c
+++ b/www/snownews/patches/patch-conversions_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-conversions_c,v 1.5 2006/02/20 16:33:55 naddy Exp $
---- conversions.c.orig	Thu Feb 16 22:14:10 2006
-+++ conversions.c	Thu Feb 16 22:17:11 2006
+$OpenBSD: patch-conversions_c,v 1.6 2007/03/18 17:19:57 martynas Exp $
+--- conversions.c.orig	Sun Jun  5 12:50:22 2005
++++ conversions.c	Sun Mar 18 18:26:42 2007
 @@ -24,6 +24,7 @@
   *
   */
@@ -25,3 +25,28 @@ $OpenBSD: patch-conversions_c,v 1.5 2006/02/20 16:33:55 naddy Exp $
  #include "digcalc.h"
  
  extern struct entity *first_entity;
+@@ -64,17 +65,22 @@ char * iconvert (char * inbuf) {
+ 	iconv_t cd;							/* Iconvs conversion descriptor. */
+ 	char *outbuf, *outbuf_first;		/* We need two pointers so we do not lose
+ 	                                      the string starting position. */
++	char target_charset[64];
+ 	size_t inbytesleft, outbytesleft;
+ 
++	(void)strlcpy(target_charset, nl_langinfo(CODESET), sizeof(target_charset));
++
+ 	/* Take a shortcut. */
+-	if (strcasecmp (TARGET_CHARSET, "UTF-8") == 0)
++	if (strcasecmp (target_charset, "UTF-8") == 0)
+ 		return strdup(inbuf);
+ 	
+ 	inbytesleft = strlen(inbuf);
+ 	outbytesleft = strlen(inbuf);
+ 
++	(void)strlcat(target_charset, "//TRANSLIT", sizeof(target_charset));
++
+ 	/* cd = iconv_open(nl_langinfo(CODESET), "UTF-8"); */
+-	cd = iconv_open (TARGET_CHARSET, "UTF-8");
++	cd = iconv_open (target_charset, "UTF-8");
+ 	if (cd == (iconv_t) -1) {
+ 		return NULL;
+ 	}
diff --git a/www/snownews/patches/patch-platform_settings b/www/snownews/patches/patch-platform_settings
deleted file mode 100644
index c325ba32f41..00000000000
--- a/www/snownews/patches/patch-platform_settings
+++ /dev/null
@@ -1,7 +0,0 @@
-$OpenBSD: patch-platform_settings,v 1.2 2005/11/03 00:52:45 cathcart Exp $
---- platform_settings.orig	Wed Sep 29 11:28:31 2004
-+++ platform_settings	Tue Oct 12 22:27:01 2004
-@@ -1,3 +1,2 @@
--PREFIX=  /usr/local
- CFLAGS=  -Wall -Wno-format-y2k -O2 -DLOCALEPATH="\"$(LOCALEPATH)\"" -DOS=\"$(shell uname)\" `xml2-config --cflags` $(EXTRA_CFLAGS)  -DSTATIC_CONST_ICONV -I/usr/local/include
- LDFLAGS= -lncurses `xml2-config --libs` $(EXTRA_LDFLAGS)  -lintl -liconv
diff --git a/www/snownews/pkg/PLIST b/www/snownews/pkg/PLIST
index de8a84ed369..fb08a163289 100644
--- a/www/snownews/pkg/PLIST
+++ b/www/snownews/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2005/11/03 00:52:45 cathcart Exp $
+@comment $OpenBSD: PLIST,v 1.9 2007/03/18 17:19:57 martynas Exp $
 @comment bin/opml2snow
 @comment bin/snow2opml
 bin/snownews
@@ -20,10 +20,6 @@ man/nl/man1/
 man/ru_RU.KOI8-R/
 man/ru_RU.KOI8-R/man1/
 @man man/ru_RU.KOI8-R/man1/snownews.1
-share/doc/snownews/
-share/doc/snownews/README
-share/doc/snownews/README.de
-share/doc/snownews/README.patching
 share/locale/de/LC_MESSAGES/snownews.mo
 share/locale/es/LC_MESSAGES/snownews.mo
 share/locale/fr/LC_MESSAGES/snownews.mo