diff --git a/SWIG/Source/Makefile.am b/SWIG/Source/Makefile.am
index 5afe09a46..748f85e69 100644
--- a/SWIG/Source/Makefile.am
+++ b/SWIG/Source/Makefile.am
@@ -39,10 +39,11 @@ swig_SOURCES = 	CParse/cscanner.c		\
 		DOH/string.c			\
 		DOH/void.c			\
 		Modules/allocate.cxx		\
-		Modules/emit.cxx		\
 		Modules/browser.cxx		\
 		Modules/chicken.cxx		\
 		Modules/contract.cxx		\
+		Modules/csharp.cxx		\
+		Modules/emit.cxx		\
 		Modules/guile.cxx		\
 		Modules/java.cxx		\
 		Modules/lang.cxx		\
diff --git a/SWIG/Source/Modules/main.cxx b/SWIG/Source/Modules/main.cxx
index cf37e2661..0ed3bc9d2 100644
--- a/SWIG/Source/Modules/main.cxx
+++ b/SWIG/Source/Modules/main.cxx
@@ -251,7 +251,7 @@ int SWIG_main(int argc, char *argv[], Language *l) {
        Printf(stderr, "Warning: Could not determine SWIG library location. Assuming " SWIG_LIB "\n");
        sprintf(LibDir,"%s",SWIG_LIB);    // Build up search paths
       } else {
-       strcpy(p+1, "Lib");
+       strcpy(p+1, "..\\..\\Lib");
        strcpy(LibDir, buf);
       }
 #else
diff --git a/SWIG/Source/Modules/swigmain.cxx b/SWIG/Source/Modules/swigmain.cxx
index f868347ee..e90659930 100644
--- a/SWIG/Source/Modules/swigmain.cxx
+++ b/SWIG/Source/Modules/swigmain.cxx
@@ -48,7 +48,7 @@ extern "C" {
   Language *swig_sexp(void);
   Language *swig_xml(void);
   Language *swig_chicken(void);
-  /* Language *swig_csharp(void); */
+  Language *swig_csharp(void);
 }
 
 struct swig_module {
@@ -63,7 +63,7 @@ struct swig_module {
 
 swig_module  modules[] = {  
   {"-chicken",   swig_chicken,   "CHICKEN"},
-  /* {"-csharp",    NULL,    "CSHARP"}, */
+  {"-csharp",    swig_csharp,    "CSharp"},
   {"-guile",     swig_guile,     "Guile"},
   {"-java",      swig_java,      "Java"},
   {"-mzscheme",  swig_mzscheme,  "Mzscheme"},