diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index f26a57e5095..cc26ca65426 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2008/08/27 18:25:02 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2008/10/16 17:29:33 jasper Exp $
 
 COMMENT=		minimalistic console-based audio player
 
-DISTNAME=		herrie-2.1
+DISTNAME=		herrie-2.2
 CATEGORIES=		audio
 
 HOMEPAGE=		http://herrie.info/
@@ -39,7 +39,7 @@ CONFIGURE_ARGS= 	ncurses \
 
 NO_REGRESS=		Yes
 
-LANGS=			ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN
+LANGS=			ca da de es fi ga nl pl pt_BR ru sv tr uk vi zh_CN
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/herrie ${PREFIX}/bin
diff --git a/audio/herrie/distinfo b/audio/herrie/distinfo
index 3306dbfc81a..9c80065b6c8 100644
--- a/audio/herrie/distinfo
+++ b/audio/herrie/distinfo
@@ -1,5 +1,5 @@
-MD5 (herrie-2.1.tar.gz) = rjfIGEvqe+Q8V/hyNEc4Sg==
-RMD160 (herrie-2.1.tar.gz) = 6jrkRBiOxMLP8AolI1c9RFckqbc=
-SHA1 (herrie-2.1.tar.gz) = XLVHnO4jHna/FyONEvPr+jt2H7Q=
-SHA256 (herrie-2.1.tar.gz) = eeyBoCjR2lFeoOw+ku/LewECitd/LaxZoV0eWUQyC6s=
-SIZE (herrie-2.1.tar.gz) = 83579
+MD5 (herrie-2.2.tar.gz) = LvamIAojhDQ4yHT051AOdg==
+RMD160 (herrie-2.2.tar.gz) = E3S2il4zLQubjGs9jaqV/GucDK0=
+SHA1 (herrie-2.2.tar.gz) = g2SZ2xAH2UHAQ1+/NYy/68WkjaI=
+SHA256 (herrie-2.2.tar.gz) = H9JfS/IMZEFYQDs/OFmTYglw5L3f1CduALsfqFm8Rn8=
+SIZE (herrie-2.2.tar.gz) = 84843
diff --git a/audio/herrie/patches/patch-herrie_conf_sample b/audio/herrie/patches/patch-herrie_conf_sample
index 2454c7dd264..b435ddbb825 100644
--- a/audio/herrie/patches/patch-herrie_conf_sample
+++ b/audio/herrie/patches/patch-herrie_conf_sample
@@ -1,6 +1,6 @@
-$OpenBSD: patch-herrie_conf_sample,v 1.1 2007/11/06 20:45:21 jakemsr Exp $
---- herrie.conf.sample.orig	Sun Sep 23 06:21:10 2007
-+++ herrie.conf.sample	Tue Nov  6 02:59:28 2007
+$OpenBSD: patch-herrie_conf_sample,v 1.2 2008/10/16 17:29:33 jasper Exp $
+--- herrie.conf.sample.orig	Tue Oct 14 21:20:40 2008
++++ herrie.conf.sample	Tue Oct 14 21:21:13 2008
 @@ -3,22 +3,22 @@
  
  # Use this line to change the behaviour of the playlist to be like
@@ -14,12 +14,12 @@ $OpenBSD: patch-herrie_conf_sample,v 1.1 2007/11/06 20:45:21 jakemsr Exp $
  
  # Switch file browser to a certain directory at startup:
 -gui.browser.defaultpath=/vol/music
-+#gui.browser.defaultpath=/please/configure/the/music/directory
++#gui.browser.defaultpath=/vol/music
  
  # Enable AudioScrobbler song submission. Make sure you generate the
- # password with `echo -n p4ssw0rd | md5'. It's probably not a good idea
- # to place these switches in the public config file. You'd better stick
- # these switches in ~/.herrie/config, with 0600 permissions:
+ # password with `printf %s p4ssw0rd | md5'. It's probably not a good
+ # idea to place these switches in the public config file. You'd better
+ # stick these switches in ~/.herrie/config, with 0600 permissions:
 -scrobbler.username=SomeUser
 -scrobbler.password=0011223344556677889900aabbccddeeff
 +#scrobbler.username=SomeUser
@@ -29,5 +29,5 @@ $OpenBSD: patch-herrie_conf_sample,v 1.1 2007/11/06 20:45:21 jakemsr Exp $
  # and use these switches. It should be reasonably safe...:
 -vfs.lockup.chroot=/vol/music
 -vfs.lockup.user=nobody
-+#vfs.lockup.chroot=/please/configure/the/music/directory
++#vfs.lockup.chroot=/vol/music
 +#vfs.lockup.user=nobody
diff --git a/audio/herrie/pkg/PLIST b/audio/herrie/pkg/PLIST
index fe356536a65..9f2d7c7659d 100644
--- a/audio/herrie/pkg/PLIST
+++ b/audio/herrie/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2008/08/27 18:25:02 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.10 2008/10/16 17:29:33 jasper Exp $
 @bin bin/herrie
 @man man/man1/herrie.1
 share/herrie/
@@ -16,5 +16,6 @@ share/locale/pt_BR/LC_MESSAGES/herrie.mo
 share/locale/ru/LC_MESSAGES/herrie.mo
 share/locale/sv/LC_MESSAGES/herrie.mo
 share/locale/tr/LC_MESSAGES/herrie.mo
+share/locale/uk/LC_MESSAGES/herrie.mo
 share/locale/vi/LC_MESSAGES/herrie.mo
 share/locale/zh_CN/LC_MESSAGES/herrie.mo