diff --git a/knetworkconf/knetworkconf/Makefile.am b/knetworkconf/knetworkconf/Makefile.am
index 2fe7ee1..4bd0c8c 100644
--- a/knetworkconf/knetworkconf/Makefile.am
+++ b/knetworkconf/knetworkconf/Makefile.am
@@ -33,7 +33,7 @@ xdg_apps_DATA = kcm_knetworkconfmodule.desktop
 KDE_ICON = AUTO
 
 messages: rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/knetworkconf.pot; \
 	fi
diff --git a/lilo-config/common/CMakeLists.txt b/lilo-config/common/CMakeLists.txt
index 2682ad5..da0be8a 100644
--- a/lilo-config/common/CMakeLists.txt
+++ b/lilo-config/common/CMakeLists.txt
@@ -17,5 +17,5 @@ link_directories(
 ##### liloconfig-common (static) ################
 
 tde_add_library( liloconfig-common STATIC_PIC AUTOMOC
-  SOURCES String.cc Files.cc Disks.cc Config.cc lilo.cc
+  SOURCES String.cpp Files.cpp Disks.cpp Config.cpp lilo.cpp
 )
diff --git a/lilo-config/common/Config.cc b/lilo-config/common/Config.cpp
similarity index 99%
rename from lilo-config/common/Config.cc
rename to lilo-config/common/Config.cpp
index 37921ba..db458ec 100644
--- a/lilo-config/common/Config.cc
+++ b/lilo-config/common/Config.cpp
@@ -1,4 +1,4 @@
-/* Config.cc
+/* Config.cpp
 **
 ** Copyright (C) 2000,2001 by Bernhard Rosenkraenzer
 **
diff --git a/lilo-config/common/Disks.cc b/lilo-config/common/Disks.cpp
similarity index 99%
rename from lilo-config/common/Disks.cc
rename to lilo-config/common/Disks.cpp
index b4a417d..fccd55a 100644
--- a/lilo-config/common/Disks.cc
+++ b/lilo-config/common/Disks.cpp
@@ -1,4 +1,4 @@
-/* Disks.cc
+/* Disks.cpp
 **
 ** Copyright (C) 2000,2001 by Bernhard Rosenkraenzer
 **
diff --git a/lilo-config/common/Files.cc b/lilo-config/common/Files.cpp
similarity index 99%
rename from lilo-config/common/Files.cc
rename to lilo-config/common/Files.cpp
index 19af29d..85171e5 100644
--- a/lilo-config/common/Files.cc
+++ b/lilo-config/common/Files.cpp
@@ -1,4 +1,4 @@
-/* Files.cc
+/* Files.cpp
 **
 ** Copyright (C) 2000,2001 by Bernhard Rosenkraenzer
 **
diff --git a/lilo-config/common/Makefile.am b/lilo-config/common/Makefile.am
index 37b44eb..42bb2f3 100644
--- a/lilo-config/common/Makefile.am
+++ b/lilo-config/common/Makefile.am
@@ -7,5 +7,5 @@ noinst_HEADERS = \
 	String.h Files.h Disks.h Config.h lilo.h
 
 libcommon_la_SOURCES = \
-	String.cc Files.cc Disks.cc Config.cc lilo.cc
+	String.cpp Files.cpp Disks.cpp Config.cpp lilo.cpp
 
diff --git a/lilo-config/common/String.cc b/lilo-config/common/String.cpp
similarity index 99%
rename from lilo-config/common/String.cc
rename to lilo-config/common/String.cpp
index f8a0e35..578d513 100644
--- a/lilo-config/common/String.cc
+++ b/lilo-config/common/String.cpp
@@ -1,4 +1,4 @@
-/* String.cc
+/* String.cpp
 **
 ** Copyright (C) 2000,2001 by Bernhard Rosenkraenzer
 **
diff --git a/lilo-config/common/lilo.cc b/lilo-config/common/lilo.cpp
similarity index 99%
rename from lilo-config/common/lilo.cc
rename to lilo-config/common/lilo.cpp
index 4171170..d9d44c7 100644
--- a/lilo-config/common/lilo.cc
+++ b/lilo-config/common/lilo.cpp
@@ -1,4 +1,4 @@
-/* lilo.cc
+/* lilo.cpp
 **
 ** Copyright (C) 2000,2001 by Bernhard Rosenkraenzer
 **
diff --git a/lilo-config/common/tests/Makefile.am b/lilo-config/common/tests/Makefile.am
index 8059a44..2fd3288 100644
--- a/lilo-config/common/tests/Makefile.am
+++ b/lilo-config/common/tests/Makefile.am
@@ -3,7 +3,7 @@ noinst_PROGRAMS = String
 INCLUDES = -I.. $(all_includes)
 
 String_SOURCES = \
-	String.cc
+	String.cpp
 
 messages:
 
diff --git a/lilo-config/common/tests/String.cc b/lilo-config/common/tests/String.cpp
similarity index 100%
rename from lilo-config/common/tests/String.cc
rename to lilo-config/common/tests/String.cpp