diff --git a/examples/test_mapi/Program.cs b/examples/dotnet/Program.cs
similarity index 100%
rename from examples/test_mapi/Program.cs
rename to examples/dotnet/Program.cs
diff --git a/examples/test_mapi/test_mapi.csproj b/examples/dotnet/test_mapi.csproj
similarity index 100%
rename from examples/test_mapi/test_mapi.csproj
rename to examples/dotnet/test_mapi.csproj
diff --git a/examples/test_mapi/build.cmd b/examples/test_mapi/build.cmd
deleted file mode 100644
index bfc0870aa..000000000
--- a/examples/test_mapi/build.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-copy ..\..\external\Microsoft.Z3.dll .
-copy ..\..\external\Z3.dll .
-
-csc /reference:..\..\external\Microsoft.Z3.dll /platform:anycpu /reference:System.Numerics.dll Program.cs
\ No newline at end of file
diff --git a/scripts/mk_make.py b/scripts/mk_make.py
index 610cc86e6..238197b17 100644
--- a/scripts/mk_make.py
+++ b/scripts/mk_make.py
@@ -75,6 +75,7 @@ add_hlib('cpp', 'bindings/c++', includes2install=['z3++.h'])
 set_z3py_dir('bindings/python')
 # Examples
 add_cpp_example('cpp_example', 'c++') 
+add_dotnet_example('dotnet_example', 'dotnet')
 
 update_version(4, 2, 0, 0)
 mk_auto_src()
diff --git a/scripts/mk_util.py b/scripts/mk_util.py
index f7d80e73c..b0e7dfad9 100644
--- a/scripts/mk_util.py
+++ b/scripts/mk_util.py
@@ -602,9 +602,41 @@ class CppExampleComponent(ExampleComponent):
             out.write(' ')
             out.write('%s/%s' % (self.to_ex_dir, cppfile))
         out.write(' ')
-        out.write(dll)
+        if IS_WINDOW:
+            out.write('%s.lib' % dll_name)
+        else:
+            out.write(dll)
         out.write(' $(LINK_EXTRA_FLAGS)\n')
-        if exefile.strip(' ') != self.name:
+        out.write('_ex_%s: %s\n\n' % (self.name, exefile))
+
+class DotNetExampleComponent(ExampleComponent):
+    def __init__(self, name, path):
+        ExampleComponent.__init__(self, name, path)
+
+    def is_example(self):
+        return IS_WINDOW
+
+    def mk_makefile(self, out):
+        if IS_WINDOW:
+            dll_name = get_component(DOTNET_COMPONENT).dll_name
+            dll = '%s.dll' % dll_name
+            exefile = '%s.exe' % self.name
+            out.write('%s: %s' % (exefile, dll))
+            for csfile in get_cs_files(self.ex_dir):
+                out.write(' ')
+                out.write('%s/%s' % (self.to_ex_dir, csfile))
+            out.write('\n')
+            out.write('\tcsc /out:%s /reference:%s /debug:full /reference:System.Numerics.dll' % (exefile, dll))
+            if VS_X64:
+                out.write(' /platform:x64')
+            else:
+                out.write(' /platform:x86')
+            for csfile in get_cs_files(self.ex_dir):
+                out.write(' ')
+                # HACK
+                win_ex_dir = self.to_ex_dir.replace('/', '\\')
+                out.write('%s\\%s' % (win_ex_dir, csfile))
+            out.write('\n')
             out.write('_ex_%s: %s\n\n' % (self.name, exefile))
 
 def reg_component(name, c):
@@ -641,6 +673,10 @@ def add_cpp_example(name, path=None):
     c = CppExampleComponent(name, path)
     reg_component(name, c)
 
+def add_dotnet_example(name, path=None):
+    c = DotNetExampleComponent(name, path)
+    reg_component(name, c)
+
 # Copy configuration correct file to BUILD_DIR
 def cp_config_mk():
     if IS_WINDOW:
@@ -699,8 +735,9 @@ def mk_makefile():
         if c.main_component():
             out.write(' %s' % c.name)
     out.write('\n\t@echo Z3 was successfully built.\n')
-    out.write("\t@echo Use the following command to install Z3 at prefix $(PREFIX).\n")
-    out.write('\t@echo "    sudo make install"\n')
+    if not IS_WINDOW:
+        out.write("\t@echo Use the following command to install Z3 at prefix $(PREFIX).\n")
+        out.write('\t@echo "    sudo make install"\n')
     # Generate :examples rule
     out.write('examples:')
     for c in _Components:
@@ -726,12 +763,12 @@ def mk_makefile():
         if IS_WINDOW:
             if VS_X64:
                 print "  platform: x64\n"
-                print "To build Z3, open a ***Visual Studio x64 Command Prompt***, then"
+                print "To build Z3, open a [Visual Studio x64 Command Prompt], then"
             else:
                 print "  platform: x86"
-                print "To build Z3, open a ***Visual Studio Command Prompt***, then"
+                print "To build Z3, open a [Visual Studio Command Prompt], then"
             print "type 'cd %s/%s && nmake'\n" % (os.getcwd(), BUILD_DIR)
-            print 'Remark: to open a Visual Studio Command Prompt, go to: "Start > All Programs > Visual Studio > Visual Studio Tools >"'
+            print 'Remark: to open a Visual Studio Command Prompt, go to: "Start > All Programs > Visual Studio > Visual Studio Tools"'
         else:
             print "Type 'cd %s; make' to build Z3" % BUILD_DIR
         
diff --git a/scripts/update_api.py b/scripts/update_api.py
index a073596a8..ce0d44b4e 100644
--- a/scripts/update_api.py
+++ b/scripts/update_api.py
@@ -311,7 +311,7 @@ def mk_dotnet():
     dotnet.write('        public unsafe class LIB\n')
     dotnet.write('        {\n')
     dotnet.write('           '
-                 '            const string Z3_DLL_NAME = \"z3.dll\";\n'
+                 '            const string Z3_DLL_NAME = \"libz3.dll\";\n'
                  '            \n');
     dotnet.write('            [DllImport(Z3_DLL_NAME, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]\n')
     dotnet.write('            public extern static void Z3_set_error_handler(Z3_context a0, Z3_error_handler a1);\n\n')