diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile
index d98e2d63acc..2271eb61936 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2008/10/08 16:02:29 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2009/01/24 11:07:04 landry Exp $
 
 COMMENT=	gtk2 comic book viewer
 
-DISTNAME=	comix-3.6.5
+DISTNAME=	comix-4.0.2
 CATEGORIES=	graphics
 
 MAINTAINER=	Mathieu Sauve-Frankel <msf@openbsd.org>
@@ -21,21 +21,24 @@ PY_FLAVOR=	python${MODPY_VERSION}
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	:py-Imaging-*-${PY_FLAVOR}:graphics/py-Imaging,${PY_FLAVOR} \
 		::x11/py-gtk2 \
+		::misc/shared-mime-info \
+		::devel/gconf2 \
 		:desktop-file-utils-*:devel/desktop-file-utils
 
 NO_REGRESS=	Yes
 
 post-extract:
-		${GUNZIP_CMD} ${WRKSRC}/comix.1.gz
+		${GUNZIP_CMD} ${WRKSRC}/comix.1.gz ${WRKSRC}/mime/comicthumb.1.gz
 
 do-build:
-		# defined as empty to override do-build target from python module
+		${SUBST_CMD} -c ${WRKSRC}/src/comix.py ${WRKSRC}/comix
 
 do-install:
-		cd ${WRKSRC} && ${MODPY_BIN} install.py --installdir ${PREFIX} \
-		       	--no-mime --no-balloon install
-		perl -pi -e "s,#!/usr/bin/env python,#!${MODPY_BIN}," \
-			${PREFIX}/bin/comix
+		cd ${WRKSRC} && ${MODPY_BIN} install.py --dir ${PREFIX} install
+		# schemas files are always installed under LOCALBASE, not PREFIX
+		${INSTALL_DATA_DIR} ${WRKINST}/${LOCALBASE}/share/schemas/comix/
+		${INSTALL_DATA} ${WRKSRC}/mime/comicbook.schemas \
+			${WRKINST}/${LOCALBASE}/share/schemas/comix/
 
 PKG_ARCH=	*
 
diff --git a/graphics/comix/distinfo b/graphics/comix/distinfo
index fd60f0ad32b..4e30a7c6c68 100644
--- a/graphics/comix/distinfo
+++ b/graphics/comix/distinfo
@@ -1,5 +1,5 @@
-MD5 (comix-3.6.5.tar.gz) = T2IQ7gS1sByzerWGOCeKAw==
-RMD160 (comix-3.6.5.tar.gz) = V9BLl69MX6W5wykCMbDFvykYdic=
-SHA1 (comix-3.6.5.tar.gz) = CJZnYACNaO8joTIoPkPIRXmD2so=
-SHA256 (comix-3.6.5.tar.gz) = ecZ9HR180yRLggh5rybSA7YmiAXWOw7r00gQvmUegQE=
-SIZE (comix-3.6.5.tar.gz) = 459165
+MD5 (comix-4.0.2.tar.gz) = i/JWXcJYzNw3UqdQJd0TDg==
+RMD160 (comix-4.0.2.tar.gz) = qHQBXuCAcW0Hr66pVkA0NICulRM=
+SHA1 (comix-4.0.2.tar.gz) = 56DyZisdaecb7hzi2R/C6I+SVgE=
+SHA256 (comix-4.0.2.tar.gz) = pG445O7Xg1S/C1iBF1gp/npbtNhPC8voZnamIb4U0zY=
+SIZE (comix-4.0.2.tar.gz) = 436107
diff --git a/graphics/comix/patches/patch-install_py b/graphics/comix/patches/patch-install_py
index 032c323645f..99c8c58b196 100644
--- a/graphics/comix/patches/patch-install_py
+++ b/graphics/comix/patches/patch-install_py
@@ -1,12 +1,67 @@
-$OpenBSD: patch-install_py,v 1.1 2007/11/20 18:53:21 mgrimm Exp $
---- install.py.orig	Mon Nov 19 19:36:30 2007
-+++ install.py	Mon Nov 19 19:38:08 2007
-@@ -156,7 +156,7 @@ if args == ["install"]:
-     check_dependencies()
-     print "Installing Comix in", install_dir, "...\n"
-     install("comix", "bin/comix")
--    install("comix.1.gz", "share/man/man1/comix.1.gz")
-+    install("comix.1", "man/man1/comix.1")
-     install("comix.desktop", "share/applications/comix.desktop")
-     install("images/logo/comix.png", "share/pixmaps/comix.png")
-     install("images/logo/comix.png", "share/icons/hicolor/48x48/apps/comix.png")
+$OpenBSD: patch-install_py,v 1.2 2009/01/24 11:07:04 landry Exp $
+
+install files in the right place, and don't try to run
+update-mime-database and gconftool-2, will be done in fake.
+
+--- install.py.orig	Fri Jan  2 00:07:54 2009
++++ install.py	Wed Jan 21 22:58:26 2009
+@@ -35,7 +35,8 @@ TRANSLATIONS = ('ca', 'cs', 'es', 'hr', 'id', 'ja', 'k
+ # 'de', 'it', 'nl', 'fr', 'el', 'hu', 'fa'
+ 
+ # Files to be installed, as (source file, destination directory)
+-FILES = (('src/about.py', 'share/comix/src'),
++FILES = (('comix', 'bin'),
++         ('src/about.py', 'share/comix/src'),
+          ('src/about.pyc', 'share/comix/src'),
+          ('src/archive.py', 'share/comix/src'),
+          ('src/archive.pyc', 'share/comix/src'),
+@@ -123,7 +124,7 @@ FILES = (('src/about.py', 'share/comix/src'),
+          ('images/tango-archive.png', 'share/comix/images'),
+          ('images/tango-enhance-image.png', 'share/comix/images'),
+          ('images/tango-image.png', 'share/comix/images'),
+-         ('comix.1.gz', 'share/man/man1'),
++         ('comix.1', 'man/man1'),
+          ('comix.desktop', 'share/applications'),
+          ('images/16x16/comix.png', 'share/icons/hicolor/16x16/apps'),
+          ('images/22x22/comix.png', 'share/icons/hicolor/22x22/apps'),
+@@ -132,12 +133,9 @@ FILES = (('src/about.py', 'share/comix/src'),
+          ('images/48x48/comix.png', 'share/icons/hicolor/48x48/apps'),
+          ('images/comix.svg', 'share/icons/hicolor/scalable/apps'))
+ 
+-# Symlinks to be created, as (target, symlink)
+-LINKS = (('../share/comix/src/comix.py', 'bin/comix'),)
+-
+ # Mime files to be installed, as (source file, destination directory)
+ MIME_FILES = (('mime/comicthumb', 'bin'),
+-              ('mime/comicthumb.1.gz', 'share/man/man1'),
++              ('mime/comicthumb.1', 'man/man1'),
+               ('mime/comix.xml', 'share/mime/packages'),
+               ('mime/icons/16x16/application-x-cbz.png',
+                 'share/icons/hicolor/16x16/mimetypes'),
+@@ -304,26 +302,11 @@ if args == ['install']:
+     for lang in TRANSLATIONS:
+         install(os.path.join('messages', lang, 'LC_MESSAGES/comix.mo'),
+             os.path.join('share/locale/', lang, 'LC_MESSAGES'))
+-    for src, link in LINKS:
+-        make_link(src, link)
+     if install_mime:
+         for src, dst in MIME_FILES:
+             install(src, dst)
+         for src, link in MIME_LINKS:
+             make_link(src, link)
+-        os.popen('update-mime-database "%s"' % 
+-            os.path.join(install_dir, 'share/mime'))
+-        print '\nUpdated mime database (added .cbz, .cbr and .cbt file types.)'
+-        schema = os.path.join(source_dir, 'mime/comicbook.schemas')
+-        os.popen('GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) '
+-                 'gconftool-2 --makefile-install-rule "%s" 2>/dev/null' %
+-                    schema)
+-        print '\nRegistered comic archive thumbnailer in gconf (if available).'
+-        print 'The thumbnailer is only supported by some file managers,',
+-        print 'such as Nautilus'
+-        print 'and Thunar.'
+-        print 'You might have to restart the file manager for the thumbnailer',
+-        print 'to be activated.'
+     os.utime(os.path.join(install_dir, 'share/icons/hicolor'), None)
+ # ---------------------------------------------------------------------------
+ # Uninstall Comix.
diff --git a/graphics/comix/patches/patch-src_comix_py b/graphics/comix/patches/patch-src_comix_py
new file mode 100644
index 00000000000..1b559322551
--- /dev/null
+++ b/graphics/comix/patches/patch-src_comix_py
@@ -0,0 +1,22 @@
+$OpenBSD: patch-src_comix_py,v 1.1 2009/01/24 11:07:04 landry Exp $
+
+point python to where comix modules are installed
+
+--- src/comix.py.orig	Sat Nov 15 22:42:12 2008
++++ src/comix.py	Sat Jan 24 11:45:35 2009
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!${MODPY_BIN}
+ 
+ """Comix - GTK Comic Book Viewer
+ 
+@@ -24,6 +24,9 @@ Copyright (C) 2005-2008 Pontus Ekberg
+ import os
+ import sys
+ import gettext
++
++# add path for comix python modules
++sys.path.insert(0, '${PREFIX}/share/comix/src')
+ 
+ import deprecated
+ import main
diff --git a/graphics/comix/pkg/PLIST b/graphics/comix/pkg/PLIST
index d4bca1ab7a6..3a191168cb9 100644
--- a/graphics/comix/pkg/PLIST
+++ b/graphics/comix/pkg/PLIST
@@ -1,66 +1,144 @@
-@comment $OpenBSD: PLIST,v 1.5 2008/10/08 16:02:29 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.6 2009/01/24 11:07:04 landry Exp $
+bin/comicthumb
 bin/comix
+@man man/man1/comicthumb.1
 @man man/man1/comix.1
 share/applications/comix.desktop
+share/comix/
+share/comix/images/
+share/comix/images/16x16/
+share/comix/images/16x16/comix.png
+share/comix/images/comix.svg
+share/comix/images/comments.png
+share/comix/images/double-page.png
+share/comix/images/fitbest.png
+share/comix/images/fitheight.png
+share/comix/images/fitmanual.png
+share/comix/images/fitwidth.png
+share/comix/images/gimp-flip-horizontal.png
+share/comix/images/gimp-flip-vertical.png
+share/comix/images/gimp-rotate-180.png
+share/comix/images/gimp-rotate-270.png
+share/comix/images/gimp-rotate-90.png
+share/comix/images/gimp-thumbnails.png
+share/comix/images/gimp-transform.png
+share/comix/images/lens.png
+share/comix/images/library.png
+share/comix/images/manga.png
+share/comix/images/tango-add-bookmark.png
+share/comix/images/tango-archive.png
+share/comix/images/tango-enhance-image.png
+share/comix/images/tango-image.png
+share/comix/images/zoom.png
+share/comix/src/
+share/comix/src/about.py
+share/comix/src/about.pyc
+share/comix/src/archive.py
+share/comix/src/archive.pyc
+share/comix/src/bookmark.py
+share/comix/src/bookmark.pyc
+share/comix/src/comix.py
+share/comix/src/comment.py
+share/comix/src/comment.pyc
+share/comix/src/constants.py
+share/comix/src/constants.pyc
+share/comix/src/cursor.py
+share/comix/src/cursor.pyc
+share/comix/src/deprecated.py
+share/comix/src/deprecated.pyc
+share/comix/src/edit.py
+share/comix/src/edit.pyc
+share/comix/src/encoding.py
+share/comix/src/encoding.pyc
+share/comix/src/enhance.py
+share/comix/src/enhance.pyc
+share/comix/src/event.py
+share/comix/src/event.pyc
+share/comix/src/filechooser.py
+share/comix/src/filechooser.pyc
+share/comix/src/filehandler.py
+share/comix/src/filehandler.pyc
+share/comix/src/histogram.py
+share/comix/src/histogram.pyc
+share/comix/src/icons.py
+share/comix/src/icons.pyc
+share/comix/src/image.py
+share/comix/src/image.pyc
+share/comix/src/labels.py
+share/comix/src/labels.pyc
+share/comix/src/lens.py
+share/comix/src/lens.pyc
+share/comix/src/library.py
+share/comix/src/library.pyc
+share/comix/src/librarybackend.py
+share/comix/src/librarybackend.pyc
+share/comix/src/main.py
+share/comix/src/main.pyc
+share/comix/src/portability.py
+share/comix/src/portability.pyc
+share/comix/src/preferences.py
+share/comix/src/preferences.pyc
+share/comix/src/process.py
+share/comix/src/process.pyc
+share/comix/src/properties.py
+share/comix/src/properties.pyc
+share/comix/src/recent.py
+share/comix/src/recent.pyc
+share/comix/src/slideshow.py
+share/comix/src/slideshow.pyc
+share/comix/src/status.py
+share/comix/src/status.pyc
+share/comix/src/thumbbar.py
+share/comix/src/thumbbar.pyc
+share/comix/src/thumbnail.py
+share/comix/src/thumbnail.pyc
+share/comix/src/thumbremover.py
+share/comix/src/thumbremover.pyc
+share/comix/src/ui.py
+share/comix/src/ui.pyc
+share/icons/hicolor/16x16/apps/comix.png
+share/icons/hicolor/16x16/mimetypes/application-x-cbr.png
+share/icons/hicolor/16x16/mimetypes/application-x-cbt.png
+share/icons/hicolor/16x16/mimetypes/application-x-cbz.png
+share/icons/hicolor/22x22/apps/comix.png
+share/icons/hicolor/22x22/mimetypes/application-x-cbr.png
+share/icons/hicolor/22x22/mimetypes/application-x-cbt.png
+share/icons/hicolor/22x22/mimetypes/application-x-cbz.png
+share/icons/hicolor/24x24/apps/comix.png
+share/icons/hicolor/24x24/mimetypes/application-x-cbr.png
+share/icons/hicolor/24x24/mimetypes/application-x-cbt.png
+share/icons/hicolor/24x24/mimetypes/application-x-cbz.png
+share/icons/hicolor/32x32/apps/comix.png
+share/icons/hicolor/32x32/mimetypes/application-x-cbr.png
+share/icons/hicolor/32x32/mimetypes/application-x-cbt.png
+share/icons/hicolor/32x32/mimetypes/application-x-cbz.png
 share/icons/hicolor/48x48/apps/comix.png
+share/icons/hicolor/48x48/mimetypes/application-x-cbr.png
+share/icons/hicolor/48x48/mimetypes/application-x-cbt.png
+share/icons/hicolor/48x48/mimetypes/application-x-cbz.png
 share/icons/hicolor/scalable/apps/comix.svg
 share/locale/ca/LC_MESSAGES/comix.mo
 share/locale/cs/LC_MESSAGES/comix.mo
-share/locale/de/LC_MESSAGES/comix.mo
-share/locale/el/LC_MESSAGES/comix.mo
 share/locale/es/LC_MESSAGES/comix.mo
-share/locale/fa/LC_MESSAGES/comix.mo
-share/locale/fr/LC_MESSAGES/comix.mo
 share/locale/hr/LC_MESSAGES/comix.mo
-share/locale/hu/LC_MESSAGES/comix.mo
 share/locale/id/LC_MESSAGES/comix.mo
-share/locale/it/LC_MESSAGES/comix.mo
 share/locale/ja/LC_MESSAGES/comix.mo
 share/locale/ko/LC_MESSAGES/comix.mo
-share/locale/nl/LC_MESSAGES/comix.mo
 share/locale/pl/LC_MESSAGES/comix.mo
 share/locale/pt_BR/LC_MESSAGES/comix.mo
 share/locale/ru/LC_MESSAGES/comix.mo
 share/locale/sv/LC_MESSAGES/comix.mo
 share/locale/zh_CN/LC_MESSAGES/comix.mo
 share/locale/zh_TW/LC_MESSAGES/comix.mo
-share/pixmaps/
-share/pixmaps/comix/
-share/pixmaps/comix.png
-share/pixmaps/comix/cbr.png
-share/pixmaps/comix/cbt.png
-share/pixmaps/comix/cbz.png
-share/pixmaps/comix/double-page.png
-share/pixmaps/comix/fitheight.png
-share/pixmaps/comix/fitnone.png
-share/pixmaps/comix/fitscreen.png
-share/pixmaps/comix/fitwidth.png
-share/pixmaps/comix/flip-horizontal-jpeg.png
-share/pixmaps/comix/flip-horizontal.png
-share/pixmaps/comix/flip-vertical-jpeg.png
-share/pixmaps/comix/flip-vertical.png
-share/pixmaps/comix/lens.png
-share/pixmaps/comix/manga.png
-share/pixmaps/comix/rotate-180.png
-share/pixmaps/comix/rotate-270-jpeg.png
-share/pixmaps/comix/rotate-270.png
-share/pixmaps/comix/rotate-90-jpeg.png
-share/pixmaps/comix/rotate-90.png
-share/pixmaps/comix/silk-bookmarks.png
-share/pixmaps/comix/silk-colour-adjust.png
-share/pixmaps/comix/silk-desaturate.png
-share/pixmaps/comix/silk-edit-bookmarks.png
-share/pixmaps/comix/silk-file-operations.png
-share/pixmaps/comix/silk-library-add.png
-share/pixmaps/comix/silk-library.png
-share/pixmaps/comix/silk-recent-files.png
-share/pixmaps/comix/silk-slideshow.png
-share/pixmaps/comix/silk-thumbnails.png
-share/pixmaps/comix/silk-toolbars.png
-share/pixmaps/comix/silk-transform.png
-share/pixmaps/comix/silk-view.png
-share/pixmaps/comix/silk-zoom.png
+share/mime/packages/comix.xml
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/comix/*.schemas > /dev/null
+share/schemas/
+share/schemas/comix/
+share/schemas/comix/comicbook.schemas
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/comix/*.schemas > /dev/null
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
 @unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database
+@exec %D/bin/update-mime-database %D/share/mime
+@unexec %D/bin/update-mime-database %D/share/mime