diff --git a/Makefile.am b/Makefile.am
index 899d821..8ece522 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBDIRS = kernel cucul caca src test tools cxx DotNet ruby doc
+SUBDIRS = kernel cucul caca src test tools csharp cxx ruby doc
 DIST_SUBDIRS = $(SUBDIRS) msvc
 
 EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in common.h libcaca.spec
diff --git a/configure.ac b/configure.ac
index 025c865..d913d0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,10 +60,10 @@ AC_ARG_ENABLE(vga,
   [  --enable-vga            VGA support (default disabled)])
 
 dnl language bindings
+AC_ARG_ENABLE(csharp,
+  [  --enable-csharp         C# bindings (autodetected)])
 AC_ARG_ENABLE(cxx,
   [  --enable-cxx            C++ bindings (default enabled)])
-AC_ARG_ENABLE(dotnet,
-  [  --enable-dotnet         .NET bindings (autodetected)])
 AC_ARG_ENABLE(ruby,
   [  --enable-ruby           Ruby bindings (autodetected)])
 
@@ -321,15 +321,15 @@ if test "${enable_cxx}" != "no"; then
 fi
 AM_CONDITIONAL(USE_CXX, test "${ac_cv_my_have_cxx}" = "yes")
 
-# Build the DotNet bindings?
-ac_cv_my_have_dotnet="no"
-if test "${enable_dotnet}" != "no"; then
+# Build the .NET bindings?
+ac_cv_my_have_csharp="no"
+if test "${enable_csharp}" != "no"; then
   AC_PATH_PROG(GMCS, gmcs, no)
   if test "${GMCS}" != "no"; then
-    ac_cv_my_have_dotnet="yes"
+    ac_cv_my_have_csharp="yes"
   fi
 fi
-AM_CONDITIONAL(USE_DOTNET, test "${ac_cv_my_have_dotnet}" = "yes")
+AM_CONDITIONAL(USE_CSHARP, test "${ac_cv_my_have_csharp}" = "yes")
 
 # Build the Ruby bindings?
 ac_cv_my_have_ruby="no"
@@ -411,8 +411,8 @@ AC_CONFIG_FILES([
   src/Makefile
   test/Makefile
   tools/Makefile
+  csharp/Makefile
   cxx/Makefile
-  DotNet/Makefile
   ruby/Makefile
   doc/Makefile
   msvc/Makefile
diff --git a/DotNet/.gitignore b/csharp/.gitignore
similarity index 100%
rename from DotNet/.gitignore
rename to csharp/.gitignore
diff --git a/DotNet/AssemblyInfo.cs b/csharp/AssemblyInfo.cs
similarity index 100%
rename from DotNet/AssemblyInfo.cs
rename to csharp/AssemblyInfo.cs
diff --git a/DotNet/Caca.cs b/csharp/Caca.cs
similarity index 100%
rename from DotNet/Caca.cs
rename to csharp/Caca.cs
diff --git a/DotNet/Cucul.cs b/csharp/Cucul.cs
similarity index 100%
rename from DotNet/Cucul.cs
rename to csharp/Cucul.cs
diff --git a/DotNet/Makefile.am b/csharp/Makefile.am
similarity index 97%
rename from DotNet/Makefile.am
rename to csharp/Makefile.am
index 3c9bff7..51692ad 100644
--- a/DotNet/Makefile.am
+++ b/csharp/Makefile.am
@@ -1,6 +1,6 @@
 # $Id: $
 
-if USE_DOTNET
+if USE_CSHARP
 noinst_DATA = libCucul.dll libCaca.dll test.exe
 endif
 
diff --git a/DotNet/libCaca.dll.config b/csharp/libCaca.dll.config
similarity index 100%
rename from DotNet/libCaca.dll.config
rename to csharp/libCaca.dll.config
diff --git a/DotNet/libCucul.dll.config b/csharp/libCucul.dll.config
similarity index 100%
rename from DotNet/libCucul.dll.config
rename to csharp/libCucul.dll.config
diff --git a/DotNet/test.cs b/csharp/test.cs
similarity index 100%
rename from DotNet/test.cs
rename to csharp/test.cs