diff --git a/srcpkgs/xarchiver/patches/add-mime-types.patch b/srcpkgs/xarchiver/patches/add-mime-types.patch
new file mode 100644
index 00000000000..32db8f2cf7c
--- /dev/null
+++ b/srcpkgs/xarchiver/patches/add-mime-types.patch
@@ -0,0 +1,17 @@
+diff -Naur xarchiver.desktop.in.orig xarchiver.desktop.in
+--- xarchiver.desktop.in.orig	2014-05-12 01:08:12.159131913 +0000
++++ xarchiver.desktop.in	2014-05-12 01:09:02.585526393 +0000
+@@ -4,11 +4,11 @@
+ _Name=Xarchiver
+ _Comment=A GTK+2 only archive manager
+ _GenericName=Archive manager
+-Exec=xarchiver
++Exec=xarchiver %f
+ Icon=xarchiver
+ Terminal=false
+ Type=Application
+ X-MultipleArgs=false
+ Categories=GTK;Archiving;Utility;
+ StartupNotify=true
+-MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;
++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm;
diff --git a/srcpkgs/xarchiver/patches/fix-password-protected.patch b/srcpkgs/xarchiver/patches/fix-password-protected.patch
new file mode 100644
index 00000000000..c4aaa526cdb
--- /dev/null
+++ b/srcpkgs/xarchiver/patches/fix-password-protected.patch
@@ -0,0 +1,42 @@
+diff -Naur src/window.c.orig xarchiver-0.5.2/src/window.c
+--- src/window.c.orig	2014-01-24 08:10:09.305990000 +0100
++++ src/window.c	2014-01-24 08:42:45.110729290 +0100
+@@ -1694,7 +1694,7 @@
+		{
+			if (archive->passwd == NULL)
+			{
+-				archive->passwd = xa_create_password_dialog(NULL);
++				archive->passwd = xa_create_password_dialog(archive);
+				if ( archive->passwd == NULL)
+				{
+					gtk_drag_finish (dc,FALSE,FALSE,t);
+@@ -2702,9 +2702,12 @@
+
+	if (entry->is_encrypted)
+	{
+-		archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
+		if (archive[idx]->passwd == NULL)
+-			return;
++		{
++			archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
++			if (archive[idx]->passwd == NULL)
++				return;
++		}
+	}
+	filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL);
+	if (g_file_test(filename,G_FILE_TEST_EXISTS))
+@@ -2768,8 +2771,12 @@
+	{
+		if (entry->is_encrypted)
+		{
+-		  if (archive->passwd == NULL)
+-			 return;
++			if (archive->passwd == NULL)
++			{
++				archive->passwd = xa_create_password_dialog(archive);
++				if (archive->passwd == NULL)
++					return;
++			}
+		}
+		if (archive->extraction_path)
+		{
diff --git a/srcpkgs/xarchiver/patches/fix-rpm-support.patch b/srcpkgs/xarchiver/patches/fix-rpm-support.patch
new file mode 100644
index 00000000000..ec04ebe70aa
--- /dev/null
+++ b/srcpkgs/xarchiver/patches/fix-rpm-support.patch
@@ -0,0 +1,86 @@
+diff -Naur src/rpm.c.orig src/rpm.c
+--- src/rpm.c.orig	2014-02-09 16:26:24.000000000 +0100
++++ src/rpm.c	2014-02-19 07:54:27.744136749 +0100
+@@ -23,8 +23,11 @@
+
+ void xa_open_rpm (XArchive *archive)
+ {
++	unsigned char bytes[8];
+	unsigned short int i;
+-	 int response;
++	 int dl,il,sigsize,offset,response;
++	 gchar *ibs,*executable;
++	 gchar *gzip_tmp = NULL;
+	GSList *list = NULL;
+	FILE *stream;
+	gboolean result;
+@@ -53,14 +56,68 @@
+		archive->column_types[i] = types[i];
+
+	xa_create_liststore (archive,names);
++	 if (fseek ( stream, 104 , SEEK_CUR ) )
++	 {
++		 fclose (stream);
++		 response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek to position 104:"),g_strerror(errno));
++		 return;
++	 }
++	 if ( fread ( bytes, 1, 8, stream ) == 0 )
++	{
++		fclose ( stream );
++		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
++		return;
++	 }
++	 il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
++	 dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
++	 sigsize = 8 + 16 * il + dl;
++	 offset = 104 + sigsize + ( 8 - ( sigsize % 8 ) ) % 8 + 8;
++	 if (fseek ( stream, offset  , SEEK_SET ) )
++	 {
++		 fclose (stream);
++		 response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek in file:"),g_strerror(errno));
++		 return;
++	 }
++	 if ( fread ( bytes, 1, 8, stream ) == 0 )
++	{
++		fclose ( stream );
++		response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno));
++		return;
++	 }
++	 il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3];
++	 dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7];
++	sigsize = 8 + 16 * il + dl;
++	offset = offset + sigsize;
++	fclose (stream);
+
+	/* Create a unique temp dir in /tmp */
+	result = xa_create_temp_directory (archive);
+	if (!result)
+		return;
+
++	gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL);
++	ibs = g_strdup_printf ( "%u" , offset );
++
+	/* Now I run dd to have the bzip2 / gzip compressed cpio archive in /tmp */
+-	gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL);
++	gchar *command = g_strconcat ( "dd if=",archive->escaped_path," ibs=",ibs," skip=1 of=",gzip_tmp,NULL);
++	g_free (ibs);
++	list = g_slist_append(list,command);
++	batch_mode = TRUE;
++	result = xa_run_command (archive,list);
++	if (result == FALSE)
++	{
++		g_free (gzip_tmp);
++		return;
++	}
++	if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP)
++		executable = "gzip -dc ";
++	else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2)
++		executable = "bzip2 -dc ";
++	else
++		executable = "xz -dc ";
++
++	command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL);
++	g_free(gzip_tmp);
+	list = NULL;
+	list = g_slist_append(list,command);
+	result = xa_run_command (archive,list);
diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template
index cdc805f8fe1..ad12729a6df 100644
--- a/srcpkgs/xarchiver/template
+++ b/srcpkgs/xarchiver/template
@@ -1,6 +1,6 @@
 # Template file for 'xarchiver'
 pkgname=xarchiver
-version=0.5.3
+version=0.5.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
@@ -11,4 +11,4 @@ homepage="http://xarchiver.sourceforge.net/"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c5899cb495e83a63f89b5eea002d2dd1c691db8d7b6343b3c182ce6e00c16d81
+checksum=e63fa73979fcc56efe8cca9095fd915d31a1714ce9676246b8626f164e452ef4