diff --git a/bsc/paraver/default.nix b/bsc/paraver/default.nix
index 7c441b8..b57a913 100644
--- a/bsc/paraver/default.nix
+++ b/bsc/paraver/default.nix
@@ -5,13 +5,14 @@
 , libxml2
 , xml2
 , fetchurl
-, wxGTK31
+, wxGTK28
 , autoconf
 , automake
+, wxpropgrid
 }:
 
 let
-  wx = wxGTK31;
+  wx = wxGTK28;
 in
 stdenv.mkDerivation rec {
   pname = "wxparaver";
@@ -36,9 +37,9 @@ stdenv.mkDerivation rec {
     # Patch shebang as /usr/bin/env is missing in nix
     sed -i '1c#!/bin/sh' src/paraver-cfgs/install.sh
 
-    sed -i '1524d' src/wxparaver/src/gtimeline.cpp
-    sed -i '806d' src/wxparaver/src/gtimeline.cpp
-    sed -i '142d' src/wxparaver/src/paravermain.cpp
+    #sed -i '1524d' src/wxparaver/src/gtimeline.cpp
+    #sed -i '806d' src/wxparaver/src/gtimeline.cpp
+    #sed -i '142d' src/wxparaver/src/paravermain.cpp
   '';
   #TODO: Move the sed commands to proper patches (and maybe send them upstream?)
 
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-boost=${boost}"
     "--with-wx-config=${wx}/bin/wx-config"
+    "--with-wxpropgrid-dir=${wxpropgrid}"
   ];
 
   buildInputs = [
diff --git a/bsc/wxpropgrid/default.nix b/bsc/wxpropgrid/default.nix
new file mode 100644
index 0000000..fc4c6da
--- /dev/null
+++ b/bsc/wxpropgrid/default.nix
@@ -0,0 +1,26 @@
+{
+  stdenv
+, fetchurl
+, wxGTK28
+}:
+
+let
+  #wx = wxGTK31; # BUG
+  wx = wxGTK28;
+in
+stdenv.mkDerivation rec {
+  pname = "wxpropgrid";
+  version = "1.4.15";
+
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/wxpropgrid/wxpropgrid-${version}-src.tar.gz";
+    sha256 = "1f62468x5s4h775bn5svlkv0lzzh06aciljpiqn5k3w2arkaijgh";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    wx
+  ];
+
+}
diff --git a/overlay.nix b/overlay.nix
index 71a0479..8db7c7d 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -97,6 +97,7 @@ let
 
     fftw = callPackage ./bsc/fftw/default.nix { };
 
+    wxpropgrid = callPackage ./bsc/wxpropgrid/default.nix { };
     paraver = callPackage ./bsc/paraver/default.nix { };
     paraverDebug = bsc.paraver.overrideAttrs (old:
     {