diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
new file mode 100644
index 00000000000..c0c18d9f39f
--- /dev/null
+++ b/audio/gtkpod/Makefile
@@ -0,0 +1,38 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2004/12/16 16:37:14 jcs Exp $
+
+COMMENT=	"GTK+2 program to synchronize an Apple iPod"
+
+DISTNAME=	gtkpod-0.85.0
+CATEGORIES=	audio x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkpod/}
+
+HOMEPAGE=	http://gtkpod.sourceforge.net/
+
+MAINTAINER=	joshua stein <jcs@openbsd.org>
+
+# gpl
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+USE_X11=	Yes
+
+LIB_DEPENDS=	atk-1.0.800.0::devel/atk \
+		id3tag.2::audio/libid3tag \
+		gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
+		glib-2.0.0.0,gmodule-2.0.0.0,gobject-2.0.0.0,gthread-2.0.0.0::devel/glib2 \
+		pango-1.0.600.0,pangox-1.0.600.0,pangoxft-1.0.600.0::devel/pango \
+		mp4v2.0::audio/faad
+
+WANTLIB=	X11 Xcursor Xext Xft Xinerama Xrender c fontconfig freetype m \
+		pthread
+
+MODULES=	gettext
+
+CONFIGURE_STYLE= gnu
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
+		CFLAGS="-I${LOCALBASE}/include" \
+		CPPFLAGS="-I${LOCALBASE}/include"
+
+.include <bsd.port.mk>
diff --git a/audio/gtkpod/distinfo b/audio/gtkpod/distinfo
new file mode 100644
index 00000000000..f2db3f5ec2a
--- /dev/null
+++ b/audio/gtkpod/distinfo
@@ -0,0 +1,3 @@
+MD5 (gtkpod-0.85.0.tar.gz) = ca870acf255dd240a02d387485940c3c
+RMD160 (gtkpod-0.85.0.tar.gz) = aa1c4814ce8950617d08e4d9f41956e8464a04e1
+SHA1 (gtkpod-0.85.0.tar.gz) = 903c78dc39ef0b4bf0f7509cb5e14baf535cb703
diff --git a/audio/gtkpod/patches/patch-src_charset_c b/audio/gtkpod/patches/patch-src_charset_c
new file mode 100644
index 00000000000..09ebb3a72bc
--- /dev/null
+++ b/audio/gtkpod/patches/patch-src_charset_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_charset_c,v 1.1.1.1 2004/12/16 16:37:14 jcs Exp $
+--- src/charset.c.orig	Sun Dec 12 13:35:40 2004
++++ src/charset.c	Sun Dec 12 13:39:42 2004
+@@ -439,7 +439,7 @@ gchar *charset_to_charset (const gchar *
+ 			     NULL);        /* GError **error    */
+ 	    if (bytes_read > br0)  br0 = bytes_read; /* max. nr. of
+ 							converted Bytes */
+-	    if (br == bytes_read)  ++bytes_read; /* don't do an
++	    if (br >= bytes_read)  bytes_read = ++br; /* don't do an
+ 						    infinite loop */
+ 	}
+ 	if (ret == NULL)
diff --git a/audio/gtkpod/patches/patch-src_mp4file_h b/audio/gtkpod/patches/patch-src_mp4file_h
new file mode 100644
index 00000000000..270ef0a4975
--- /dev/null
+++ b/audio/gtkpod/patches/patch-src_mp4file_h
@@ -0,0 +1,9 @@
+$OpenBSD: patch-src_mp4file_h,v 1.1.1.1 2004/12/16 16:37:14 jcs Exp $
+--- src/mp4file.h.orig	Sun Dec 12 23:15:03 2004
++++ src/mp4file.h	Sun Dec 12 23:17:00 2004
+@@ -34,3 +34,5 @@
+ gboolean mp4_write_file_info (gchar *filename, Track *track);
+ Track *mp4_get_file_info (gchar *name);
+ #endif
++
++#define HAVE_GLIB_H 1
diff --git a/audio/gtkpod/pkg/DESCR b/audio/gtkpod/pkg/DESCR
new file mode 100644
index 00000000000..facfdc5d354
--- /dev/null
+++ b/audio/gtkpod/pkg/DESCR
@@ -0,0 +1,5 @@
+gtkpod is a platform independent GUI for Apple's iPod using GTK2.  It
+allows one to upload songs and playlists to your iPod.  It supports
+ID3 tag editing, multiple charsets for ID3 tags, detects duplicate
+songs, allows offline modification of the database with later
+synchronization, and more.
diff --git a/audio/gtkpod/pkg/PLIST b/audio/gtkpod/pkg/PLIST
new file mode 100644
index 00000000000..b32d222bbb4
--- /dev/null
+++ b/audio/gtkpod/pkg/PLIST
@@ -0,0 +1,36 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2004/12/16 16:37:14 jcs Exp $
+bin/gtkpod
+share/gtkpod/
+share/gtkpod/pixmaps/
+share/gtkpod/pixmaps/gtkpod-add-dirs.png
+share/gtkpod/pixmaps/gtkpod-add-files.png
+share/gtkpod/pixmaps/gtkpod-add-playlists.png
+share/gtkpod/pixmaps/gtkpod-icon-32.png
+share/gtkpod/pixmaps/gtkpod-icon-32x32-2.png
+share/gtkpod/pixmaps/gtkpod-icon-32x32.png
+share/gtkpod/pixmaps/gtkpod-icon-48.png
+share/gtkpod/pixmaps/gtkpod-icon-48x48.png
+share/gtkpod/pixmaps/gtkpod-icon-64x64.png
+share/gtkpod/pixmaps/gtkpod-logo.png
+share/gtkpod/pixmaps/gtkpod-new-playlist.png
+share/gtkpod/pixmaps/gtkpod-read.png
+share/gtkpod/pixmaps/gtkpod-sync.png
+share/gtkpod/scripts/
+share/gtkpod/scripts/sync-kaddressbook.sh
+share/gtkpod/scripts/sync-korganizer.sh
+share/locale/
+share/locale/de/
+share/locale/de/LC_MESSAGES/
+share/locale/de/LC_MESSAGES/gtkpod.mo
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
+share/locale/fr/LC_MESSAGES/gtkpod.mo
+share/locale/it/
+share/locale/it/LC_MESSAGES/
+share/locale/it/LC_MESSAGES/gtkpod.mo
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
+share/locale/ja/LC_MESSAGES/gtkpod.mo
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
+share/locale/sv/LC_MESSAGES/gtkpod.mo