diff --git a/x11/emelfm2/Makefile b/x11/emelfm2/Makefile
index bfec3836f52..5336a8a1ab8 100644
--- a/x11/emelfm2/Makefile
+++ b/x11/emelfm2/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2009/03/07 14:23:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2009/04/06 17:19:02 giovanni Exp $
 
 COMMENT =		GTK+2 file manager
 
-DISTNAME =		emelfm2-0.5.0
-PKGNAME =		${DISTNAME}p1
+DISTNAME =		emelfm2-0.5.1
 CATEGORIES =		x11
 HOMEPAGE =		http://emelfm2.net/
 
-MAINTAINER =		Giovanni Bechis <g.bechis@snb.it>
+MAINTAINER =		Giovanni Bechis <giovanni@openbsd.org>
 
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
@@ -16,22 +15,17 @@ PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
 MASTER_SITES =	${HOMEPAGE}rel/
-WRKDIST =	${WRKDIR}/emelfm2-0.5
 EXTRACT_SUFX =	.tar.bz2
 
-MODULES =	devel/gettext
-
 LIB_DEPENDS =	gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
 
+WANTLIB =	X11 c cairo glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+		intl m pango-1.0 pangocairo-1.0 pthread
+
 RUN_DEPENDS =	::devel/desktop-file-utils \
 		::devel/xdg-utils
 
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pixman-1 png pthread z
-
+MAKE_ENV =	CC=${CC} USE_LATEST=1
 USE_X11 =	Yes
 USE_GMAKE =	Yes
 NO_REGRESS =	Yes
diff --git a/x11/emelfm2/distinfo b/x11/emelfm2/distinfo
index ccb572b880f..2795af34393 100644
--- a/x11/emelfm2/distinfo
+++ b/x11/emelfm2/distinfo
@@ -1,5 +1,5 @@
-MD5 (emelfm2-0.5.0.tar.bz2) = Js4++pc5xgG+4IL2QsZqwQ==
-RMD160 (emelfm2-0.5.0.tar.bz2) = +Y+RDSLvsyWT41h/QdxsOCtQYQo=
-SHA1 (emelfm2-0.5.0.tar.bz2) = 2XG2j6DlWdf84RYugVSKyKdQfSU=
-SHA256 (emelfm2-0.5.0.tar.bz2) = OQWUEBA5B2Lw2Cfl0UIjilwRgXCvynxKemaajU+APp0=
-SIZE (emelfm2-0.5.0.tar.bz2) = 967187
+MD5 (emelfm2-0.5.1.tar.bz2) = +XeE5GWwwpaF4FcFLKOaGA==
+RMD160 (emelfm2-0.5.1.tar.bz2) = JRhnLLwVkvt5lIoNVZhM7ki/URo=
+SHA1 (emelfm2-0.5.1.tar.bz2) = 9yLocEKhHa/iqx6DzlMIP5XQQeY=
+SHA256 (emelfm2-0.5.1.tar.bz2) = wflLGpaColJs4SJ16YKPt0Yaey42CcGimt8OqTKJAKI=
+SIZE (emelfm2-0.5.1.tar.bz2) = 1002588
diff --git a/x11/emelfm2/patches/patch-Makefile b/x11/emelfm2/patches/patch-Makefile
index f4937059881..2ad4ef87099 100644
--- a/x11/emelfm2/patches/patch-Makefile
+++ b/x11/emelfm2/patches/patch-Makefile
@@ -1,25 +1,44 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2008/10/30 19:32:32 landry Exp $
---- Makefile.orig	Sat Oct 18 00:37:53 2008
-+++ Makefile	Thu Oct 30 18:28:33 2008
-@@ -48,7 +48,7 @@ COPYRIGHT=2003-$(shell date +"%04Y"), tooar <tooar@gmx
+$OpenBSD: patch-Makefile,v 1.2 2009/04/06 17:19:02 giovanni Exp $
+--- Makefile.orig	Thu Feb 12 04:47:20 2009
++++ Makefile	Sat Mar 21 12:23:23 2009
+@@ -211,7 +211,7 @@ lLIBS_CFLAGS = -shared -fPIC -DPIC
  
- #these are only used here for installation purposes
- BIN_DIR = $(PREFIX)/bin
--MAN_DIR = $(PREFIX)/share/man/man1
-+MAN_DIR = $(PREFIX)/man/man1
- #as well as usage here, all in-code uses of these is assumed localised
- ifeq ($(DOCS_VERSION), 1)
- DOC_DIR = $(PREFIX)/share/doc/$(TARGET)-$(VERSION)
-@@ -212,7 +212,7 @@ endif
- 
- lLDFLAGS = $(LDFLAGS)
+ #setup linking
  # -lrt needed for clock_gettime()
 -lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0) -lrt
 +lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0)
  ifeq ($(USE_FAM),1)
  lLIBS += -lfam
  endif
-@@ -337,34 +337,34 @@ endif
+@@ -237,7 +237,7 @@ all: $(OBJECTS_DIR) $(BUILD_FILE) $(TARGET) $(LIBS) $(
+ 
+ plugins: $(OBJECTS_DIR)/$(LIBS) $(LIBS_OBJECTS) $(LIBS_XOBJECTS)
+ 
+-install: all install_plugins
++install: all install_i18n install_plugins
+ 	@echo "installing $(TARGET) to prefix '$(PREFIX)'"
+ 	@install -d -m 755 $(BIN_DIR)
+ 	@install -m 755 $(TARGET) $(BIN_DIR)
+@@ -249,8 +249,7 @@ install: all install_plugins
+ 	@for file in `ls $(DOCS)/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v $(TARGET).1`; do \
+ 		install -m 644 $(DOCS)/$$file $(DOC_DIR); \
+ 	done
+-	@install -d $(MAN_DIR)
+-	@install -m 644 $(DOCS)/$(TARGET).1 $(MAN_DIR);
++	@install -m 644 $(DOCS)/$(TARGET).1 $(PREFIX)/man/man1;
+ #	@bzip2 -f $(MAN_DIR)/$(TARGET).1;
+ 
+ ifeq ($(XDG_INTEGRATION), 1)
+@@ -314,7 +313,7 @@ clean_plugins:
+ 
+ $(TARGET): $(OBJECTS)
+ 	@echo "linking binary '$(TARGET)'"
+-	@$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -Wl,--as-needed $(lLIBS)
++	$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -Wl,--as-needed $(lLIBS)
+ ifneq ($(DEBUG), 1)
+ 	@echo "stripping binary '$(TARGET)'"
+ 	@strip $(TARGET)
+@@ -322,39 +321,39 @@ endif
  
  $(OBJECTS): $(OBJECTS_DIR)/%.o: %.c
  	@echo "compiling '$*.c'"
@@ -28,24 +47,53 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2008/10/30 19:32:32 landry Exp $
  
  $(LIBS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
  	@echo "compiling '$*.c'"
--	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) -o $@ $*.c
-+	$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) -o $@ $*.c
+-	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(LDFLAGS) -o $@ $*.c
++	$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(LDFLAGS) -o $@ $*.c
+ ifneq ($(DEBUG), 1)
+ 	@strip -g $@
+ endif
  
- deps: $(DEP_FILES) $(LIB_DEP_FILES)
- $(DEP_FILES): $(OBJECTS_DIR)
+ $(THUMBS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
+ 	@echo "compiling '$*.c'"
+-	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(THUMBS_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(THUMBS_LIBS)
++	$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(THUMBS_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(THUMBS_LIBS)
+ ifneq ($(DEBUG), 1)
+ 	@strip -g $@
+ endif
+ 
+ $(ACL_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
+ 	@echo "compiling '$*.c'"
+-	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(ACL_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(ACL_LIBS)
++	$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(ACL_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(ACL_LIBS)
+ ifneq ($(DEBUG), 1)
+ 	@strip -g $@
+ endif
+ 
+ $(TRACKER_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
+ 	@echo "compiling '$*.c'"
+-	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(TRACKER_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(TRACKER_LIBS)
++	$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(TRACKER_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(TRACKER_LIBS)
+ ifneq ($(DEBUG), 1)
+ 	@strip -g $@
+ endif
+ 
+ $(VFS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
+ 	@echo "compiling '$*.c'"
+-	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(VFS_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(VFS_LIBS)
++	$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(VFS_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(VFS_LIBS)
+ ifneq ($(DEBUG), 1)
+ 	@strip -g $@
+ endif
+@@ -364,7 +363,7 @@ $(DEP_FILES): $(OBJECTS_DIR)
  $(DEP_FILES): $(BUILD_FILE)
  $(DEP_FILES): $(OBJECTS_DIR)/%.deps: %.c
  	@echo "generating '$@'"
 -	@$(CC) $(lCFLAGS) -MM -o $@ $*.c
 +	$(CC) $(lCFLAGS) -MM -o $@ $*.c
  
- $(LIB_DEP_FILES): $(OBJECTS_DIR)
- $(LIB_DEP_FILES): $(BUILD_FILE)
- $(LIB_DEP_FILES): $(OBJECTS_DIR)/%.deps: %.c
- 	@echo "generating '$@'"
--	@$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) -MM -o $@ $*.c
-+	$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) -MM -o $@ $*.c
- 
+ #$(LIB_DEP_FILES): $(OBJECTS_DIR)
+ #$(LIB_DEP_FILES): $(BUILD_FILE)
+@@ -375,16 +374,16 @@ $(DEP_FILES): $(OBJECTS_DIR)/%.deps: %.c
  $(DEPS_FILE): $(BUILD_FILE)
  	@echo "generating dependencies: '$(DEPS_FILE)'"
  	@touch $(DEPS_FILE)
@@ -60,12 +108,17 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2008/10/30 19:32:32 landry Exp $
  
  #gettext:
  i18n:
-@@ -427,7 +427,7 @@ help:
+-	@$(BIN_XGETTEXT) $(foreach dir, $(DIRS) $(LIBS) $(OPTLIBS), -D $(dir)) \
++	$(BIN_XGETTEXT) $(foreach dir, $(DIRS) $(LIBS) $(OPTLIBS), -D $(dir)) \
+ 		-p ./$(PO_DIR) --from-code=UTF-8 --no-wrap --omit-header -i -F \
+ 		--copyright-holder="$(COPYRIGHT)" --keyword=_ --keyword=N_ \
+ 		$(foreach file, $(SOURCES) $(HEADERS) $(LIBS_SOURCES) $(LIBS_HEADERS), $(shell basename $(file)))
+@@ -443,7 +442,7 @@ help:
  
  $(OBJECTS_DIR):
  	@echo "creating object directories in '$(OBJECTS_DIR)'"
 -	@mkdir -p $(MKOBJDIRS)
 +	mkdir -p $(MKOBJDIRS)
  
- $(BUILD_FILE):
- 	@echo "updating build info: '$(BUILD_FILE)'"
+ $(OBJECTS_DIR)/$(LIBS):
+ 	@echo "creating plugin-object directories in '$(OBJECTS_DIR)'"
diff --git a/x11/emelfm2/patches/patch-src_e2_output_c b/x11/emelfm2/patches/patch-src_e2_output_c
index fe4ec0e3708..b90e4a2d1d5 100644
--- a/x11/emelfm2/patches/patch-src_e2_output_c
+++ b/x11/emelfm2/patches/patch-src_e2_output_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_e2_output_c,v 1.1.1.1 2008/10/30 19:32:32 landry Exp $
+$OpenBSD: patch-src_e2_output_c,v 1.2 2009/04/06 17:19:02 giovanni Exp $
 Don't include ctype, _C macro conflicts. Use glib func instead.
---- src/e2_output.c.orig	Thu Oct 30 18:58:12 2008
-+++ src/e2_output.c	Thu Oct 30 18:58:41 2008
+--- src/e2_output.c.orig	Sun Feb  1 22:51:22 2009
++++ src/e2_output.c	Thu Mar 19 19:31:50 2009
 @@ -40,7 +40,6 @@ ToDo
  #include "emelfm2.h"
  #include <string.h>
@@ -10,7 +10,7 @@ Don't include ctype, _C macro conflicts. Use glib func instead.
  #include "e2_output.h"
  #include "e2_dialog.h"
  //for pane-text activation
-@@ -629,7 +628,7 @@ nextchar:
+@@ -632,7 +631,7 @@ nextchar:
  				break;
  			else if (g_unichar_isspace (d))
  				break;
diff --git a/x11/emelfm2/patches/patch-src_filesystem_e2_fs_c b/x11/emelfm2/patches/patch-src_filesystem_e2_fs_c
index 517c93ce09c..6d8ffbce6a8 100644
--- a/x11/emelfm2/patches/patch-src_filesystem_e2_fs_c
+++ b/x11/emelfm2/patches/patch-src_filesystem_e2_fs_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_filesystem_e2_fs_c,v 1.1.1.1 2008/10/30 19:32:32 landry Exp $
---- src/filesystem/e2_fs.c.orig	Mon Oct 13 11:17:38 2008
-+++ src/filesystem/e2_fs.c	Thu Oct 30 18:26:38 2008
+$OpenBSD: patch-src_filesystem_e2_fs_c,v 1.2 2009/04/06 17:19:02 giovanni Exp $
+--- src/filesystem/e2_fs.c.orig	Tue Feb 10 23:11:01 2009
++++ src/filesystem/e2_fs.c	Thu Mar 19 19:40:14 2009
 @@ -54,7 +54,7 @@ Not implemented yet.
  #ifdef E2_VFS
  #include "e2_plugins.h"
@@ -10,7 +10,18 @@ $OpenBSD: patch-src_filesystem_e2_fs_c,v 1.1.1.1 2008/10/30 19:32:32 landry Exp
  #include "e2_complete.h"
  #endif
  
-@@ -2493,7 +2493,7 @@ gboolean e2_fs_copy_file (VPATH *src, const struct sta
+@@ -1044,8 +1044,8 @@ retry:
+ 	}
+ 	if (!(fstatus.f_flags & MNT_LOCAL))
+ 	{
+-//		if (errno == EINTR)
+-//			goto retry;
++		if (errno == EINTR)
++			goto retry;
+ 		else if (errno == ENOENT && descend && e2_utils_get_parent_path (localpath, TRUE))
+ 			goto retry;
+ 		g_free (localpath);
+@@ -2538,7 +2538,7 @@ gboolean e2_fs_copy_file (VPATH *src, const struct sta
  	//		blksize_t buf_size = 1048576;
  		//find a buffer up to 16 times dest block
  		//(compromise between accesses and multi-tasking latency)
diff --git a/x11/emelfm2/patches/patch-src_utils_e2_utils_c b/x11/emelfm2/patches/patch-src_utils_e2_utils_c
index 21df5275deb..f2452837fdb 100644
--- a/x11/emelfm2/patches/patch-src_utils_e2_utils_c
+++ b/x11/emelfm2/patches/patch-src_utils_e2_utils_c
@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_utils_e2_utils_c,v 1.1 2008/10/31 00:03:12 landry Exp $
+$OpenBSD: patch-src_utils_e2_utils_c,v 1.2 2009/04/06 17:19:02 giovanni Exp $
 Our file(1) doesn't have all that fancy options.
---- src/utils/e2_utils.c.orig	Wed Oct 22 04:28:11 2008
-+++ src/utils/e2_utils.c	Thu Oct 30 23:49:56 2008
-@@ -466,7 +466,7 @@ gchar *e2_utils_get_mimetype (VPATH *localpath)
+--- src/utils/e2_utils.c.orig	Sun Feb  1 22:51:22 2009
++++ src/utils/e2_utils.c	Thu Mar 19 19:31:50 2009
+@@ -480,7 +480,7 @@ gchar *e2_utils_get_mimetype (VPATH *localpath)
  		{
  			//xdg command failed, maybe due to no xdg utilities, or unrecognised type
  			g_free (command);
diff --git a/x11/emelfm2/pkg/PFRAG.shared b/x11/emelfm2/pkg/PFRAG.shared
index c5daf6fe05a..5e1e1d6daac 100644
--- a/x11/emelfm2/pkg/PFRAG.shared
+++ b/x11/emelfm2/pkg/PFRAG.shared
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/10/30 19:32:32 landry Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2009/04/06 17:19:02 giovanni Exp $
+lib/emelfm2/plugins/
 lib/emelfm2/plugins/e2p_clone.so
 lib/emelfm2/plugins/e2p_config.so
 lib/emelfm2/plugins/e2p_cpbar.so
diff --git a/x11/emelfm2/pkg/PLIST b/x11/emelfm2/pkg/PLIST
index 6925207ab19..a9234674052 100644
--- a/x11/emelfm2/pkg/PLIST
+++ b/x11/emelfm2/pkg/PLIST
@@ -1,8 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2008/10/30 19:32:32 landry Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/04/06 17:19:02 giovanni Exp $
 %%SHARED%%
 @bin bin/emelfm2
 lib/emelfm2/
-lib/emelfm2/plugins/
 @man man/man1/emelfm2.1
 share/application-registry/
 share/application-registry/emelfm2.applications
@@ -22,6 +21,11 @@ share/doc/emelfm2/TODO
 share/doc/emelfm2/USAGE
 share/doc/emelfm2/WARNING
 share/doc/emelfm2/help.txt
+share/locale/de/LC_MESSAGES/emelfm2.mo
+share/locale/fr/LC_MESSAGES/emelfm2.mo
+share/locale/ja/LC_MESSAGES/emelfm2.mo
+share/locale/pl/LC_MESSAGES/emelfm2.mo
+share/locale/ru/LC_MESSAGES/emelfm2.mo
 share/pixmaps/
 share/pixmaps/emelfm2/
 share/pixmaps/emelfm2/add_mark_bottom_48.png