diff --git a/Makefile.am b/Makefile.am
index 7102523..831d7ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBDIRS = kernel caca src examples tests tools csharp cxx python ruby doc
+SUBDIRS = kernel caca src examples tests tools caca-sharp cxx python ruby doc
 DIST_SUBDIRS = $(SUBDIRS) win32
 
 EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec
diff --git a/csharp/.gitignore b/caca-sharp/.gitignore
similarity index 100%
rename from csharp/.gitignore
rename to caca-sharp/.gitignore
diff --git a/csharp/AssemblyInfo.cs b/caca-sharp/AssemblyInfo.cs
similarity index 100%
rename from csharp/AssemblyInfo.cs
rename to caca-sharp/AssemblyInfo.cs
diff --git a/csharp/Attr.cs b/caca-sharp/Attr.cs
similarity index 100%
rename from csharp/Attr.cs
rename to caca-sharp/Attr.cs
diff --git a/csharp/Caca.cs b/caca-sharp/Caca.cs
similarity index 100%
rename from csharp/Caca.cs
rename to caca-sharp/Caca.cs
diff --git a/csharp/Canvas.cs b/caca-sharp/Canvas.cs
similarity index 100%
rename from csharp/Canvas.cs
rename to caca-sharp/Canvas.cs
diff --git a/csharp/Display.cs b/caca-sharp/Display.cs
similarity index 100%
rename from csharp/Display.cs
rename to caca-sharp/Display.cs
diff --git a/csharp/Dither.cs b/caca-sharp/Dither.cs
similarity index 100%
rename from csharp/Dither.cs
rename to caca-sharp/Dither.cs
diff --git a/csharp/Event.cs b/caca-sharp/Event.cs
similarity index 100%
rename from csharp/Event.cs
rename to caca-sharp/Event.cs
diff --git a/csharp/Font.cs b/caca-sharp/Font.cs
similarity index 100%
rename from csharp/Font.cs
rename to caca-sharp/Font.cs
diff --git a/csharp/Makefile.am b/caca-sharp/Makefile.am
similarity index 100%
rename from csharp/Makefile.am
rename to caca-sharp/Makefile.am
diff --git a/csharp/caca-sharp.csproj b/caca-sharp/caca-sharp.csproj
similarity index 100%
rename from csharp/caca-sharp.csproj
rename to caca-sharp/caca-sharp.csproj
diff --git a/csharp/caca-sharp.dll.config.in b/caca-sharp/caca-sharp.dll.config.in
similarity index 100%
rename from csharp/caca-sharp.dll.config.in
rename to caca-sharp/caca-sharp.dll.config.in
diff --git a/csharp/test-csharp.csproj b/caca-sharp/test-csharp.csproj
similarity index 100%
rename from csharp/test-csharp.csproj
rename to caca-sharp/test-csharp.csproj
diff --git a/csharp/test.cs b/caca-sharp/test.cs
similarity index 100%
rename from csharp/test.cs
rename to caca-sharp/test.cs
diff --git a/configure.ac b/configure.ac
index 3bba0f6..8c34c99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -489,7 +489,7 @@ AC_CONFIG_FILES([
   examples/Makefile
   tests/Makefile
   tools/Makefile
-  csharp/Makefile
+  caca-sharp/Makefile
   cxx/Makefile
   python/Makefile
   ruby/Makefile
@@ -499,7 +499,7 @@ AC_CONFIG_FILES([
 AC_CONFIG_FILES([
   caca/caca_types.h
   caca/caca.pc
-  csharp/caca-sharp.dll.config
+  caca-sharp/caca-sharp.dll.config
   cxx/caca++.pc
   doc/doxygen.cfg
 ])
diff --git a/libcaca.sln b/libcaca.sln
index 0803d26..092145a 100644
--- a/libcaca.sln
+++ b/libcaca.sln
@@ -12,12 +12,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacademo", "src\cacademo.vc
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "caca-sharp", "csharp\caca-sharp.csproj", "{046BD004-7B02-4521-BF01-9D9042F19AD5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "caca-sharp", "caca-sharp\caca-sharp.csproj", "{046BD004-7B02-4521-BF01-9D9042F19AD5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8951ECB0-7CFE-41AB-A426-98D7C441BEA4} = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-csharp", "csharp\test-csharp.csproj", "{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test-csharp", "caca-sharp\test-csharp.csproj", "{6EB34142-45E0-4BF3-8F75-81F4F604EAAA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcaca++", "cxx\libcaca++.vcproj", "{5AAFB727-094F-4104-A765-A94B32497C7D}"
 	ProjectSection(ProjectDependencies) = postProject