diff --git a/DSLogic-gui/CMakeLists.txt b/DSLogic-gui/CMakeLists.txt
index 6e7dd10e38031675195ebdecb814f84bee3a3994..6f19112136d507af30702cfe82affeba731744cc 100644
--- a/DSLogic-gui/CMakeLists.txt
+++ b/DSLogic-gui/CMakeLists.txt
@@ -34,7 +34,7 @@ project(DSLogic)
 
 option(DISABLE_WERROR "Build without -Werror" TRUE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
-option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
+option(ENABLE_DECODE "Build with libsigrokdecode" FALSE)
 option(ENABLE_COTIRE "Enable cotire" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
@@ -154,7 +154,6 @@ set(DSLogic_SOURCES
 	pv/prop/string.cpp
 	pv/prop/binding/binding.cpp
 	pv/prop/binding/deviceoptions.cpp
-	pv/prop/binding/decoderoptions.cpp
 	pv/toolbars/filebar.cpp
 	pv/toolbars/logobar.cpp
 	pv/toolbars/samplingbar.cpp
diff --git a/DSLogic-gui/pv/data/decode/annotation.cpp b/DSLogic-gui/pv/data/decode/annotation.cpp
index c3c744005c6e2c020f8fb042c2a7ff4a8934e989..32d3897047d120fefb34825c6e8c1f568e458d61 100644
--- a/DSLogic-gui/pv/data/decode/annotation.cpp
+++ b/DSLogic-gui/pv/data/decode/annotation.cpp
@@ -40,7 +40,7 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
 		(const srd_proto_data_annotation*)pdata->data;
 	assert(pda);
 
-	_format = pda->ann_format;
+	_format = pda->ann_class;
 
 	const char *const *annotations = (char**)pda->ann_text;
 	while(*annotations) {
diff --git a/DSLogic-gui/pv/mainwindow.cpp b/DSLogic-gui/pv/mainwindow.cpp
index db501b696ae4be02216f1e8447f0fceb1555e946..6292cca74f0daf21ee478ecb8217ee51b40e0f31 100644
--- a/DSLogic-gui/pv/mainwindow.cpp
+++ b/DSLogic-gui/pv/mainwindow.cpp
@@ -521,9 +521,11 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event)
             else
                 on_trigger(!_trigger_dock->isVisible());
             break;
+#ifdef ENABLE_DECODE
         case Qt::Key_D:
             on_protocol(!_protocol_dock->isVisible());
             break;
+#endif
         case Qt::Key_M:
             on_measure(!_measure_dock->isVisible());
             break;
diff --git a/DSLogic-gui/pv/sigsession.cpp b/DSLogic-gui/pv/sigsession.cpp
index bb6f23801e6c26b2abe8f5d29aaf5ac0cbbf5a55..79c428d0d311ae8f860165464cd46ebd2a53bce7 100644
--- a/DSLogic-gui/pv/sigsession.cpp
+++ b/DSLogic-gui/pv/sigsession.cpp
@@ -476,9 +476,10 @@ void SigSession::init_signals()
     unsigned int dso_probe_count = 0;
     unsigned int analog_probe_count = 0;
 
-
+#ifdef ENABLE_DECODE
     // Clear the decode traces
     _decode_traces.clear();
+#endif
 
     // Detect what data types we will receive
     if(_dev_inst) {
@@ -786,11 +787,13 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
             _cur_dso_snapshot.reset();
             _cur_analog_snapshot.reset();
 		}
+#ifdef ENABLE_DECODE
         for (vector< shared_ptr<view::DecodeTrace> >::iterator i =
             _decode_traces.begin();
             i != _decode_traces.end();
             i++)
             (*i)->decoder()->stop_decode();
+#endif
         frame_ended();
 		break;
 	}
diff --git a/DSLogic-gui/pv/sigsession.h b/DSLogic-gui/pv/sigsession.h
index 28fd79f1b289b3760735ad9abb57db0de2127101..edd22f5a2a3a9c69522ea313681706a780bfb193 100644
--- a/DSLogic-gui/pv/sigsession.h
+++ b/DSLogic-gui/pv/sigsession.h
@@ -222,7 +222,9 @@ private:
 	mutable boost::mutex _signals_mutex;
 	std::vector< boost::shared_ptr<view::Signal> > _signals;
     std::vector< boost::shared_ptr<view::GroupSignal> > _group_traces;
+#ifdef ENABLE_DECODE
     std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
+#endif
 
     mutable boost::mutex _data_mutex;
 	boost::shared_ptr<data::Logic> _logic_data;
diff --git a/DSLogic-gui/pv/view/dsldial.cpp b/DSLogic-gui/pv/view/dsldial.cpp
index ccdec2eef5386833cb68b120022a7c7fd6ddc517..15574966f36054ce0e1234306a838fc1cac38d59 100644
--- a/DSLogic-gui/pv/view/dsldial.cpp
+++ b/DSLogic-gui/pv/view/dsldial.cpp
@@ -5,8 +5,8 @@
 namespace pv {
 namespace view {
 
-dslDial::dslDial(quint64 div, quint64 step,
-                 QVector<quint64> value, QVector<QString> unit)
+dslDial::dslDial(const quint64 div, const quint64 step,
+                 const QVector<quint64> value, const QVector<QString> unit)
 {
     assert(div > 0);
     assert(step > 0);
diff --git a/DSLogic-gui/pv/view/dsldial.h b/DSLogic-gui/pv/view/dsldial.h
index 69253098915b71414d3ca011b8401671036a5b6c..bf5872c48c54eeaec4212560eede700f31797dff 100644
--- a/DSLogic-gui/pv/view/dsldial.h
+++ b/DSLogic-gui/pv/view/dsldial.h
@@ -10,8 +10,8 @@ namespace view {
 class dslDial
 {
 public:
-    dslDial(quint64 div, quint64 step,
-            QVector<quint64> value, QVector<QString> unit);
+    dslDial(const quint64 div, const quint64 step,
+            const QVector<quint64> value, const QVector<QString> unit);
     virtual ~dslDial();
 
 public:
diff --git a/DSLogic-gui/pv/view/dsosignal.cpp b/DSLogic-gui/pv/view/dsosignal.cpp
index b2b34a0d8eb5f2230da744435da1038a2c332597..42e3ae1b33e905304d3d8d07f05f0f23574398c8 100644
--- a/DSLogic-gui/pv/view/dsosignal.cpp
+++ b/DSLogic-gui/pv/view/dsosignal.cpp
@@ -113,9 +113,9 @@ DsoSignal::DsoSignal(boost::shared_ptr<pv::device::DevInst> dev_inst,
     _trig_vpos(probe->index * 0.5 + 0.25),
     _zeroPos(probe->index * 0.5 + 0.25)
 {
-    QVector<uint64_t> vValue;
+    QVector<quint64> vValue;
     QVector<QString> vUnit;
-    QVector<uint64_t> hValue;
+    QVector<quint64> hValue;
     QVector<QString> hUnit;
     for(quint64 i = 0; i < vDialValueCount; i++)
         vValue.append(vDialValue[i]);
diff --git a/DSLogic-gui/pv/view/dsosignal.h b/DSLogic-gui/pv/view/dsosignal.h
index c6b6626793be74b7ef8a32a6517f9a9460d5a640..588c7416f1f6ee4b9e3ad2e2d1df402d511f554e 100644
--- a/DSLogic-gui/pv/view/dsosignal.h
+++ b/DSLogic-gui/pv/view/dsosignal.h
@@ -45,8 +45,8 @@ private:
 	static const float EnvelopeThreshold;
 
     static const int HitCursorMargin = 3;
-    static const uint64_t vDialValueCount = 10;
-    static const uint64_t vDialValueStep = 1000;
+    static const quint64 vDialValueCount = 10;
+    static const quint64 vDialValueStep = 1000;
     static const uint64_t vDialUnitCount = 2;
     static const uint64_t hDialValueCount = 22;
     static const uint64_t hDialValueStep = 1000;
diff --git a/libsigrok4DSLogic/libsigrokdecode b/libsigrok4DSLogic/libsigrokdecode
new file mode 160000
index 0000000000000000000000000000000000000000..280d554c29fc234d27be77d602436395d01da6dd
--- /dev/null
+++ b/libsigrok4DSLogic/libsigrokdecode
@@ -0,0 +1 @@
+Subproject commit 280d554c29fc234d27be77d602436395d01da6dd