diff --git a/ChangeLog b/ChangeLog
index 1a5f556a9..014210e89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-15  Andrés G. Aragoneses  <aaragoneses@novell.com>
+
+	* atk/Makefile.am
+	* glib/Makefile.am
+	* Makefile.include: Added new 'moonlight' target, to build with
+	smcs.
+
 2009-04-14  Christian Hoff  <christian_hoff@gmx.net>
 
 	* gtk/Adjustment.custom: Deglued implementation of SetBounds.
diff --git a/Makefile.include b/Makefile.include
index 424b6e596..c11583ded 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -61,9 +61,11 @@ else
 GAPI_CDECL_INSERT=
 endif
 
+BUILD_PARAMS=$(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -target:library $(GENERATED_SOURCES) $(build_sources)
+
 $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(GENERATED_SOURCES) $(build_sources)
+	$(CSC) $(build_references) $(BUILD_PARAMS) -out:$(ASSEMBLY)
 	$(GAPI_CDECL_INSERT)
 
 install-data-local:
diff --git a/atk/Makefile.am b/atk/Makefile.am
index ce5d0b36e..6adfcc057 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -21,4 +21,18 @@ customs =			\
 
 add_dist =
 
+MOON_DIR=$(top_builddir)/moonbin/
+MOON_ASSEMBLY=$(MOON_DIR)$(ASSEMBLY)
+
+references_moon = $(MOON_DIR)glib-sharp.dll
+build_references_moon = $(addprefix /r:, $(references_moon))
+
+moonlight: $(MOON_ASSEMBLY)
+
+$(MOON_ASSEMBLY): $(references_moon) $(ASSEMBLY)
+	smcs -define:NET_2_1 $(build_references_moon) $(BUILD_PARAMS) -out:$@
+	$(GAPI_CDECL_INSERT)
+
 include ../Makefile.include
+
+
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 7e31f3870..373fd53bb 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -97,9 +97,21 @@ else
 GAPI_CDECL_INSERT=
 endif
 
+BUILD_PARAMS=$(CSFLAGS) -unsafe -nowarn:0169,0612,0618 -target:library $(references) $(build_sources)
+
 $(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -unsafe -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
+	$(CSC) $(BUILD_PARAMS) -out:$(ASSEMBLY)
+	$(GAPI_CDECL_INSERT)
+
+MOON_DIR=$(top_builddir)/moonbin/
+MOON_ASSEMBLY=$(MOON_DIR)$(ASSEMBLY)
+
+moonlight: $(MOON_ASSEMBLY)
+
+$(MOON_ASSEMBLY): $(ASSEMBLY)
+	mkdir -p $(MOON_DIR)
+	smcs -define:NET_2_1 $(BUILD_PARAMS) -out:$@
 	$(GAPI_CDECL_INSERT)
 
 policy.%.config: $(top_builddir)/policy.config