diff --git a/share/qtcreator/gdbmacros/gdbmacros.py b/share/qtcreator/gdbmacros/gdbmacros.py
index 9c274ed4426adb9ba867f4486eaef35f25f7ad30..5be49f63898cf4b64881f2da5d8f332f5ffffec8 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@ -2066,6 +2066,23 @@ def qdump____gnu_cxx__hash_set(d, item):
                             itemCount += 1
                 p = p + 1
 
+
+#######################################################################
+#
+# Boost dumper
+#
+#######################################################################
+
+def qdump__boost__optional(d, item):
+    if item.value["m_initialized"] == False:
+        d.putValue("<uninitialized>")
+        d.putNumChild(0)
+    else:
+        d.putType(item.value.type, d.currentTypePriority + 1)
+        type = item.value.type.template_argument(0)
+        d.putItemHelper(Item(item.value["m_storage"].cast(type), item.iname))
+
+
 #######################################################################
 #
 # Symbian
diff --git a/tests/manual/gdbdebugger/boost/boost.pro b/tests/manual/gdbdebugger/boost/boost.pro
new file mode 100644
index 0000000000000000000000000000000000000000..43818074d9e25b3d78a654590db6fcc8d240c1d4
--- /dev/null
+++ b/tests/manual/gdbdebugger/boost/boost.pro
@@ -0,0 +1,5 @@
+TARGET = boost
+CONFIG += qt
+DEPENDPATH += .
+INCLUDEPATH += .
+SOURCES += main.cpp
diff --git a/tests/manual/gdbdebugger/boost/main.cpp b/tests/manual/gdbdebugger/boost/main.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b012bf07940f4ae89c6b47d0fbc352536ab4a2d2
--- /dev/null
+++ b/tests/manual/gdbdebugger/boost/main.cpp
@@ -0,0 +1,31 @@
+
+#include <boost/optional.hpp>
+
+using namespace boost;
+
+struct Large
+{
+    Large() { d1 = d2 = d3 = d4 = d5 = 0; }
+
+    double d1;
+    double d2;
+    double d3;
+    double d4;
+    double d5;
+};
+
+void testOptional()
+{
+    optional<int> i;
+    optional<double> d;
+    optional<Large> l;
+    i = 1;
+    l = Large();
+    i = 2;
+    i = 3;
+}
+
+int main()
+{
+    testOptional();
+}