diff -Naur antlr-2.7.6/configure antlr-2.7.6-csharp/configure
--- antlr-2.7.6/configure	2005-12-22 14:25:50.000000000 -0500
+++ antlr-2.7.6-csharp/configure	2006-05-30 13:48:00.000000000 -0400
@@ -6192,9 +6192,9 @@
 
               ac_config_files="$ac_config_files lib/csharp/Makefile"
 
-              ac_config_files="$ac_config_files lib/csharp/src/Makefile"
+              ac_config_files="$ac_config_files lib/csharp/antlr.astframe/Makefile"
 
-              ac_config_files="$ac_config_files lib/csharp/ASTFrame/Makefile"
+              ac_config_files="$ac_config_files lib/csharp/antlr.runtime/Makefile"
 
 
     # We have a Makefile that loops through all python examples.
@@ -7137,8 +7137,8 @@
   "examples/python/xml/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/python/xml/Makefile" ;;
   "scripts/csc.sh" ) CONFIG_FILES="$CONFIG_FILES scripts/csc.sh" ;;
   "lib/csharp/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/csharp/Makefile" ;;
-  "lib/csharp/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/csharp/src/Makefile" ;;
-  "lib/csharp/ASTFrame/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/csharp/ASTFrame/Makefile" ;;
+  "lib/csharp/antlr.astframe/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/csharp/antlr.astframe/Makefile" ;;
+  "lib/csharp/antlr.runtime/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/csharp/antlr.runtime/Makefile" ;;
   "examples/csharp/ASTsupport/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/csharp/ASTsupport/Makefile" ;;
   "examples/csharp/HTML/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/csharp/HTML/Makefile" ;;
   "examples/csharp/IDL/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/csharp/IDL/Makefile" ;;
diff -Naur antlr-2.7.6/configure.in antlr-2.7.6-csharp/configure.in
--- antlr-2.7.6/configure.in	2005-12-07 13:00:32.000000000 -0500
+++ antlr-2.7.6-csharp/configure.in	2006-05-30 13:47:53.000000000 -0400
@@ -944,8 +944,8 @@
     )
 
     AC_CONFIG_FILES([lib/csharp/Makefile])
-    AC_CONFIG_FILES([lib/csharp/src/Makefile])
-    AC_CONFIG_FILES([lib/csharp/ASTFrame/Makefile])
+    AC_CONFIG_FILES([lib/csharp/antlr.astframe/Makefile])
+    AC_CONFIG_FILES([lib/csharp/antlr.runtime/Makefile])
 
     # We have a Makefile that loops through all python examples.
     case $WITH_EXAMPLES in

diff -Naur antlr-2.7.6-orig/scripts/config.deps.in antlr-2.7.6-csharp/scripts/config.deps.in
--- antlr-2.7.6-orig/scripts/config.deps.in	2005-12-07 13:00:36.000000000 -0500
+++ antlr-2.7.6-csharp/scripts/config.deps.in	2006-06-27 11:35:28.000000000 -0400
@@ -114,7 +114,7 @@
 ## variable $(subdir) proper.
 
 @ANTLR_NET@ :: 
-	@ subdir="lib/csharp/src" ; \
+	@ subdir="lib/csharp/antlr.runtime" ; \
     case $(subdir) in \
 	  $$subdir ) ;; \
 	  * ) d="@abs_this_builddir@/$$subdir" ; \
@@ -125,7 +125,7 @@
     esac
 
 @ASTFRAME_NET@ :: 
-	@ subdir="lib/csharp/ASTFrame" ; \
+	@ subdir="lib/csharp/antlr.astframe" ; \
     case $(subdir) in \
 	  $$subdir ) ;; \
 	  * ) d="@abs_this_builddir@/$$subdir" ; \