diff --git a/sample/DrawingSample.exe.config b/sample/DrawingSample.exe.config
deleted file mode 100644
index 3b2b4ff6a..000000000
--- a/sample/DrawingSample.exe.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<configuration>
-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
-  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0"/>
-  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0"/>
-</configuration>
diff --git a/sample/Makefile.am b/sample/Makefile.am
index 88fe0cbb7..26b347dc8 100755
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -24,7 +24,7 @@ VTE_TARGETS=
 VTE_ASSEMBLY=
 endif
 
-TARGETS = custom-cellrenderer.exe gtk-hello-world.exe button.exe calendar.exe subclass.exe menu.exe size.exe scribble.exe treeviewdemo.exe managedtreeviewdemo.exe testdnd.exe $(GNOME_TARGETS) $(GLADE_TARGETS) $(VTE_TARGETS)
+TARGETS = custom-cellrenderer.exe gtk-hello-world.exe button.exe calendar.exe subclass.exe menu.exe size.exe scribble.exe treeviewdemo.exe managedtreeviewdemo.exe testdnd.exe drawing-sample.exe $(GNOME_TARGETS) $(GLADE_TARGETS) $(VTE_TARGETS)
 
 assemblies=../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll $(GNOME_ASSEMBLY) $(GLADE_ASSEMBLY) $(VTE_ASSEMBLY)
 references=$(addprefix -r , $(assemblies))
@@ -81,13 +81,16 @@ cairo-sample.exe: $(srcdir)/CairoSample.cs $(assemblies)
 	$(CSC) -out:cairo-sample.exe $(references) -r:Mono.Cairo $(srcdir)/CairoSample.cs
 
 testdnd.exe: $(srcdir)/TestDnd.cs $(assemblies)
-	$(CSC) -g --unsafe -o testdnd.exe $(references) $(srcdir)/TestDnd.cs
+	$(CSC) -debug+ --unsafe -out:testdnd.exe $(references) $(srcdir)/TestDnd.cs
 
 vte-example.exe: $(srcdir)/VteTest.cs $(assemblies)
-	$(CSC) -g --unsafe -o vte-example.exe $(references) $(srcdir)/VteTest.cs
+	$(CSC) -debug+ --unsafe -out:vte-example.exe $(references) $(srcdir)/VteTest.cs
 
 custom-cellrenderer.exe: $(srcdir)/CustomCellRenderer.cs $(assemblies)
-	$(CSC) -g -o custom-cellrenderer.exe $(references) $(srcdir)/CustomCellRenderer.cs
+	$(CSC) -debug+ -out:custom-cellrenderer.exe $(references) $(srcdir)/CustomCellRenderer.cs
+
+drawing-sample.exe: $(srcdir)/DrawingSample.cs $(srcdir)/sysdraw.cs $(assemblies)
+	$(CSC) -debug+ -out:drawing-sample.exe $(references) $(srcdir)/DrawingSample.cs $(srcdir)/sysdraw.cs -r:System.Drawing
 
 EXTRA_DIST = 				\
 	HelloWorld.cs			\
@@ -109,4 +112,7 @@ EXTRA_DIST = 				\
 	CairoSample.cs			\
 	TestDnd.cs			\
 	VteTest.cs			\
-	CustomCellRenderer.cs
+	CustomCellRenderer.cs		\
+	DrawingSample.cs		\
+	sysdraw.cs			\
+	drawing-sample.exe.config
diff --git a/sample/drawing-sample.exe.config.in b/sample/drawing-sample.exe.config.in
new file mode 100644
index 000000000..0924374e0
--- /dev/null
+++ b/sample/drawing-sample.exe.config.in
@@ -0,0 +1,6 @@
+<configuration>
+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+</configuration>