diff --git a/tools/asp_state/Makefile.am b/tools/asp_state/Makefile.am
index 4df3cd1..67d0c76 100644
--- a/tools/asp_state/Makefile.am
+++ b/tools/asp_state/Makefile.am
@@ -3,6 +3,12 @@ MCSFLAGS= -debug+ -debug:full -nologo
 aspstatedir = $(libdir)/mono/1.0
 aspstate_SCRIPTS = asp-state.exe asp-state.exe.config
 
+if NET_2_0
+scripts2 = asp-state2.exe asp-state2.exe.config
+endif
+aspstate2dir = $(libdir)/mono/2.0
+aspstate2_SCRIPTS = $(scripts2)
+
 EXTRA_DIST = $(aspstate_input) asp-state.exe.config
 CLEANFILES = asp-state.exe asp-state.exe.mdb
 
@@ -14,3 +20,6 @@ aspstate_sources = $(aspstate_input:.in=)
 asp-state.exe: $(aspstate_sources)
 	$(MCS) $(MCSFLAGS) /out:$@ $^
 
+asp-state2.exe: $(aspstate_sources)
+	$(GMCS) $(MCSFLAGS) /out:$@ $^
+
diff --git a/tools/asp_state/asp-state2.exe.config b/tools/asp_state/asp-state2.exe.config
new file mode 100644
index 0000000..af49c61
--- /dev/null
+++ b/tools/asp_state/asp-state2.exe.config
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+        <system.runtime.remoting>
+                <application name="ASP.NET State Server">
+                        <service>
+                                <wellknown mode="Singleton"
+                                        type="System.Web.SessionState.RemoteStateServer, System.Web"
+                                        objectUri="StateServer" />
+                        </service>
+                        <channels>
+                                <channel ref="tcp" port="42424" />
+                        </channels>
+                </application>
+        </system.runtime.remoting>
+</configuration>
+