diff --git a/debian.changelog b/debian.changelog
index 7e7a1be..1392af3 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,3 +1,15 @@
+vym (2.5.4.1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de>  Mon, 22 Feb 2016 08:04:00 +0100
+
+vym (2.5.3.1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Drechsel <vym@insilmaril.de>  Mon, 22 Feb 2016 07:04:00 +0100
+
 vym (2.5.0.1) unstable; urgency=low
 
   * New upstream release
diff --git a/vym-2.5.0-gcc6.patch b/vym-2.5.0-gcc6.patch
deleted file mode 100644
index cffde10..0000000
--- a/vym-2.5.0-gcc6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: vym-2.5.0/exports.cpp
-===================================================================
---- vym-2.5.0.orig/exports.cpp
-+++ vym-2.5.0/exports.cpp
-@@ -556,7 +556,7 @@ void ExportKDE4Bookmarks::doExport()
-     dia.setShowAgainName("/exports/overwrite/KDE4Bookmarks");
-     if (dia.exec()==QDialog::Accepted)
-     {
--        model->exportXML(tmpDir.path(),false);
-+        model->exportXML(tmpDir.path(),"",false);
- 
-         XSLTProc p;
-         p.setInputFile (tmpDir.path()+"/"+model->getMapName()+".xml");
-@@ -586,7 +586,7 @@ void ExportFirefoxBookmarks::doExport()
-     dia.setShowAgainName("/vym/warnings/overwriteImportBookmarks");
-     if (dia.exec()==QDialog::Accepted)
-     {
--        model->exportXML(tmpDir.path(),false);
-+        model->exportXML(tmpDir.path(),"",false);
- 
-         /*
-     XSLTProc p;
-@@ -998,7 +998,7 @@ void ExportHTML::doExport(bool useDialog
- ////////////////////////////////////////////////////////////////////////
- void ExportTaskjuggler::doExport() 
- {
--    model->exportXML(tmpDir.path(),false);
-+    model->exportXML(tmpDir.path(),"",false);
- 
-     XSLTProc p;
-     p.setInputFile (tmpDir.path()+"/"+model->getMapName()+".xml");
diff --git a/vym-2.5.0.tar.bz2 b/vym-2.5.0.tar.bz2
deleted file mode 100644
index 04d4d22..0000000
--- a/vym-2.5.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55550549fcc8cc151ff6235a09bb8fc1412f0b598cc6f9072345058c5e12b9f3
-size 6740098
diff --git a/vym-2.5.4.tar.bz2 b/vym-2.5.4.tar.bz2
new file mode 100644
index 0000000..dc11137
--- /dev/null
+++ b/vym-2.5.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4d4d325842f487a16c5544859da96789792130c5c8c554e7d6abcaf94b8b3bb
+size 6743390
diff --git a/vym.changes b/vym.changes
index ded952e..b57a10a 100644
--- a/vym.changes
+++ b/vym.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 21 06:57:11 UTC 2016 - vym@insilmaril.de
+
+- Update to upstream 2.5.4
+- Remove vym-2.5.0-gcc6.patch again, not required
+
 -------------------------------------------------------------------
 Mon Jun 20 17:01:00 UTC 2016 - i@marguerite.su
 
diff --git a/vym.spec b/vym.spec
index e042e64..cb51f11 100644
--- a/vym.spec
+++ b/vym.spec
@@ -17,7 +17,7 @@
 
 
 Name:           vym
-Version:        2.5.0
+Version:        2.5.4
 Release:        0
 Summary:        View Your Mind - generate and manipulate maps which show your thoughts
 License:        GPL-2.0
@@ -30,8 +30,6 @@ Source3:        x-%{name}.desktop
 Source4:        debian.dirs
 Source5:        debian.docs
 Source6:        makedist.config
-#PATCH-FIX-UPSTREAM fix no known conversion for argument 2 from 'bool' to 'QString'
-Patch:          vym-2.5.0-gcc6.patch
 BuildRequires:  libQt5Core-devel
 BuildRequires:  libQt5Gui-devel
 BuildRequires:  libqt5-linguist-devel
@@ -51,12 +49,11 @@ etc. Some people even think it is fun to work with such maps...
 
 %prep
 %setup -q
-%patch -p1
 
 %build
+lrelease-qt5 vym.pro
 qmake-qt5 -o Makefile vym.pro PREFIX=%{_datadir} BINDIR=%{_bindir} CONFIG+=RELEASE
 make %{?_smp_mflags}
-lrelease-qt5 vym.pro
 
 %install
 mkdir -p %{buildroot}%{_datadir}/vym