diff --git a/Code/qtiplot/qtiplot/qtiplot.pro b/Code/qtiplot/qtiplot/qtiplot.pro
index 928511209ddc02293a4de21a05b610cc68d04f56..fdf229a09918e249a17cd7d05bd3f3e9d36c2de7 100644
--- a/Code/qtiplot/qtiplot/qtiplot.pro
+++ b/Code/qtiplot/qtiplot/qtiplot.pro
@@ -66,6 +66,7 @@ win32 {
 
 unix {
   INCLUDEPATH       += /usr/include/
+  INCLUDEPATH       += /usr/include/muParser/
   INCLUDEPATH       += /usr/include/qwt-qt4/
   INCLUDEPATH       += /usr/include/qwtplot3d-qt4/
   INCLUDEPATH       += /usr/include/qwt/
diff --git a/Code/qtiplot/qtiplot/qwt_compat.h b/Code/qtiplot/qtiplot/qwt_compat.h
new file mode 100644
index 0000000000000000000000000000000000000000..cbbd07459b5dd682f07e96ce641fc48cfcd3f217
--- /dev/null
+++ b/Code/qtiplot/qtiplot/qwt_compat.h
@@ -0,0 +1,18 @@
+#ifndef MANTID_QWT_COMPAT
+#define MANTID_QWT_COMPAT
+
+#include <qwt_global.h>
+
+#if QWT_VERSION >= 0x050200
+// FAA 11/04/2010: QWT 5.2.0 changed some member functions
+// QwtScaleEngine 
+//   loMargin/hiMargin renamed to lowerMargin/upperMargin
+// QwtScaleDiv 
+//   lBound/hBound renamed to lowerBound/upperBound
+#   define lBound() lowerBound()
+#   define hBound() upperBound()
+#   define loMargin() lowerMargin()
+#   define hiMargin() upperMargin()
+#endif /* QWT_VERSION >= 0x050200 */
+
+#endif /* MANTID_QWT_COMPAT */
diff --git a/Code/qtiplot/qtiplot/src/AxesDialog.cpp b/Code/qtiplot/qtiplot/src/AxesDialog.cpp
index 1cc0e91009e5b5d5c874b77c2c979cff44786c33..d4752fc6c7b91611d7899496e3e2705781810a1a 100644
--- a/Code/qtiplot/qtiplot/src/AxesDialog.cpp
+++ b/Code/qtiplot/qtiplot/src/AxesDialog.cpp
@@ -26,6 +26,7 @@
  *   Boston, MA  02110-1301  USA                                           *
  *                                                                         *
  ***************************************************************************/
+#include "qwt_compat.h"
 #include "AxesDialog.h"
 #include "ApplicationWindow.h"
 #include "TextDialog.h"
diff --git a/Code/qtiplot/qtiplot/src/Graph.cpp b/Code/qtiplot/qtiplot/src/Graph.cpp
index 64e3a004201522cd44814c4bf072da861886e3a1..a8e3f8e05416226001b392841d22100b17677c3f 100644
--- a/Code/qtiplot/qtiplot/src/Graph.cpp
+++ b/Code/qtiplot/qtiplot/src/Graph.cpp
@@ -27,6 +27,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qwt_compat.h"
 #include <QVarLengthArray>
 
 static const char *cut_xpm[]={
diff --git a/Code/qtiplot/qtiplot/src/Plot.cpp b/Code/qtiplot/qtiplot/src/Plot.cpp
index 5e7699c1adb46d44320c56923f947b86095401b5..1127a180959af66c46e9433c0848eac8797e0b29 100644
--- a/Code/qtiplot/qtiplot/src/Plot.cpp
+++ b/Code/qtiplot/qtiplot/src/Plot.cpp
@@ -26,6 +26,7 @@
  *   Boston, MA  02110-1301  USA                                           *
  *                                                                         *
  ***************************************************************************/
+#include "qwt_compat.h"
 #include "Plot.h"
 #include "Graph.h"
 #include "Grid.h"
diff --git a/Code/qtiplot/qtiplot/src/Spectrogram.cpp b/Code/qtiplot/qtiplot/src/Spectrogram.cpp
index 294fba36a43191bb24a18acbc5a49be90cad04ad..7f4f8e585617daf520171a9d09672a4e74cf6dac 100644
--- a/Code/qtiplot/qtiplot/src/Spectrogram.cpp
+++ b/Code/qtiplot/qtiplot/src/Spectrogram.cpp
@@ -26,6 +26,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qwt_compat.h"
 #include "Spectrogram.h"
 #include <math.h>
 #include <QPen>
diff --git a/Code/qtiplot/qtiplot/src/plot2D/ScaleEngine.cpp b/Code/qtiplot/qtiplot/src/plot2D/ScaleEngine.cpp
index 181d991e68a5c5e20ab935612ccf22d20b065a23..0fe44eb674c87869406c4d30cc04a453d233138c 100644
--- a/Code/qtiplot/qtiplot/src/plot2D/ScaleEngine.cpp
+++ b/Code/qtiplot/qtiplot/src/plot2D/ScaleEngine.cpp
@@ -26,6 +26,7 @@
  *   Boston, MA  02110-1301  USA                                           *
  *                                                                         *
  ***************************************************************************/
+#include "qwt_compat.h"
 #include "ScaleEngine.h"
 
 QwtScaleTransformation* ScaleEngine::transformation() const