diff --git a/recipes-misc/recipes-multimedia/qtractor/files/0007-MidiImportExtender-ensure-not-to-use-track-propertie.patch b/recipes-misc/recipes-multimedia/qtractor/files/0007-MidiImportExtender-ensure-not-to-use-track-propertie.patch
new file mode 100644
index 00000000..8098d887
--- /dev/null
+++ b/recipes-misc/recipes-multimedia/qtractor/files/0007-MidiImportExtender-ensure-not-to-use-track-propertie.patch
@@ -0,0 +1,46 @@
+From 5702e0b1c514aae433886f8574c0a43de10cde14 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 27 Nov 2017 18:39:07 +0100
+Subject: [PATCH 1/2] MidiImportExtender: ensure not to use track properties
+ before they are set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/qtractorMidiImportExtender.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qtractorMidiImportExtender.cpp b/src/qtractorMidiImportExtender.cpp
+index ea72b8a..0129d0f 100644
+--- a/src/qtractorMidiImportExtender.cpp
++++ b/src/qtractorMidiImportExtender.cpp
+@@ -369,7 +369,7 @@ bool qtractorMidiImportExtender::finishTracksForExtension(
+ 		// import. This indicates from first glance that track is special or
+ 		// broken or...
+ 		QString sTrackName;
+-		if (pTrack->midiBank() >= 0 && pTrack->midiProg() >= 0) {
++		if (properties.midiBank >= 0 && properties.midiProg >= 0) {
+ 			// Set track name based upon type set up.
+ 			switch (m_extendedSettings.eMidiImportTrackNameType) {
+ 			case Midifile:
+@@ -395,12 +395,12 @@ bool qtractorMidiImportExtender::finishTracksForExtension(
+ 
+ 					const qtractorMidiManager::Banks& banks
+ 						= list[sInstrumentName];
+-					if (!banks.contains(pTrack->midiBank()))
++					if (!banks.contains(properties.midiBank))
+ 						break;
+ 
+ 					// A patch name was found!
+-					const qtractorMidiManager::Progs& progs = banks[pTrack->midiBank()].progs;
+-					sTrackName = progs[pTrack->midiProg()];
++					const qtractorMidiManager::Progs& progs = banks[properties.midiBank].progs;
++					sTrackName = progs[properties.midiProg];
+ 				}
+ 
+ 				// Drum track's name is fixed - patch names are not really useful at drums.
+-- 
+2.9.5
+
diff --git a/recipes-misc/recipes-multimedia/qtractor/files/0008-MidiImportExtender-return-track-change-for-midi-prog.patch b/recipes-misc/recipes-multimedia/qtractor/files/0008-MidiImportExtender-return-track-change-for-midi-prog.patch
new file mode 100644
index 00000000..a37f8ebe
--- /dev/null
+++ b/recipes-misc/recipes-multimedia/qtractor/files/0008-MidiImportExtender-return-track-change-for-midi-prog.patch
@@ -0,0 +1,36 @@
+From d63c75a654c797360b4f98cba736084a987ab828 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 27 Nov 2017 19:41:04 +0100
+Subject: [PATCH 2/2] MidiImportExtender: return track change for midi program
+ change only
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/qtractorMidiImportExtender.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/qtractorMidiImportExtender.cpp b/src/qtractorMidiImportExtender.cpp
+index 0129d0f..0e11a7f 100644
+--- a/src/qtractorMidiImportExtender.cpp
++++ b/src/qtractorMidiImportExtender.cpp
+@@ -338,11 +338,12 @@ bool qtractorMidiImportExtender::finishTracksForExtension(
+ 		// Midi prog.
+ 		// Special case for drum-tracks program: Some MIDI files out in the wild do
+ 		// not set program for drum tracks. Give those a reasonable default.
+-		if (bIsDrumTrack && properties.midiProg < 0) {
++		if (bIsDrumTrack && properties.midiProg < 0)
+ 			// Set standard drums.
+ 			properties.midiProg = 0;
++		// Initial program change was missed likely (plugins did not process).
++		if (properties.midiProg >= 0)
+ 			bOneOrMoreTracksChanged = true;
+-		}
+ 
+ 		// Instrument.
+ 		QString strInstrumentNew = bIsDrumTrack ?
+-- 
+2.9.5
+
diff --git a/recipes-misc/recipes-multimedia/qtractor/qtractor_0.8.4.bb b/recipes-misc/recipes-multimedia/qtractor/qtractor_0.8.4.bb
index 961c5197..05ba18ba 100644
--- a/recipes-misc/recipes-multimedia/qtractor/qtractor_0.8.4.bb
+++ b/recipes-misc/recipes-multimedia/qtractor/qtractor_0.8.4.bb
@@ -18,15 +18,12 @@ DEPENDS += " \
 inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache
 
 SRC_URI = " \
-    git://github.com/rncbc/qtractor.git;branch=neonx \
+    git://github.com/schnitzeltony/qtractor.git \
     file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \
     file://0002-do-nor-try-run-for-float-sse-detection.patch \
     file://0003-do-nor-try-run-for-suil-libs-detection.patch \
-    file://0004-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch \
-    file://0005-Add-qtractorPluginListDocument-to-save-load-plugin-l.patch \
-    file://0006-Add-MIDI-import-options-to-create-ready-to-play-sess.patch \
 "
-SRCREV = "9bf540b60a273b4257a3616acb108d9ef075c539"
+SRCREV = "85968e9481f457d9345ab64676f46a18a3c26047"
 PV = "0.8.4+git${SRCPV}"
 S = "${WORKDIR}/git"