diff --git a/iso/Makefile.am b/iso/Makefile.am
index 7cb0fdd..9af94cf 100644
--- a/iso/Makefile.am
+++ b/iso/Makefile.am
@@ -57,7 +57,7 @@ uninstall-local:
 # make messages.po. Move this one to ../po/ and "make merge" in po
 # the -x is for skipping messages already translated in tdelibs
 messages:
-	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) -C -ki18n -x $(kde_includes)/kde.pot $$LIST -o ../po/iso.pot; \
 	fi
diff --git a/iso/iso.cpp b/iso/iso.cpp
index 019cac9..e9845c0 100644
--- a/iso/iso.cpp
+++ b/iso/iso.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
- /* This file is heavily based on tar.cc from tdebase
+ /* This file is heavily based on tar.cpp from tdebase
   * (c) David Faure <faure@kde.org>
   */
 
diff --git a/krArc/Makefile.am b/krArc/Makefile.am
index 3dde0f3..e2afcee 100644
--- a/krArc/Makefile.am
+++ b/krArc/Makefile.am
@@ -52,7 +52,7 @@ uninstall-local:
 # make messages.po. Move this one to ../po/ and "make merge" in po
 # the -x is for skipping messages already translated in tdelibs
 messages:
-	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) -C -ki18n -x $(kde_includes)/kde.pot $$LIST -o ../po/krarc.pot; \
 	fi
diff --git a/krusader/Makefile.am b/krusader/Makefile.am
index 963cdcf..2e6a014 100644
--- a/krusader/Makefile.am
+++ b/krusader/Makefile.am
@@ -189,7 +189,7 @@ krusaderuajs_DATA = \
 # messages:
 
 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)/krusader.pot; \
 	fi
diff --git a/po/tdeio_virt.pot b/po/tdeio_virt.pot
index 492760f..9d69d26 100644
--- a/po/tdeio_virt.pot
+++ b/po/tdeio_virt.pot
@@ -27,14 +27,14 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: virt.cc:80
+#: virt.cpp:80
 msgid "Virtulal delete"
 msgstr ""
 
-#: virt.cc:81
+#: virt.cpp:81
 msgid "remove from virtual space"
 msgstr ""
 
-#: virt.cc:82
+#: virt.cpp:82
 msgid "really delete"
 msgstr ""
diff --git a/tar/Makefile.am b/tar/Makefile.am
index b6180d9..d14e41e 100644
--- a/tar/Makefile.am
+++ b/tar/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = tdeio_tar.la
 
-tdeio_tar_la_SOURCES = tar.cc
+tdeio_tar_la_SOURCES = tar.cpp
 tdeio_tar_la_LIBADD = $(LIB_TDESYCOCA)
 tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
diff --git a/tar/tar.cc b/tar/tar.cpp
similarity index 100%
rename from tar/tar.cc
rename to tar/tar.cpp
diff --git a/virt/Makefile.am b/virt/Makefile.am
index 706e2f0..39c0cd9 100644
--- a/virt/Makefile.am
+++ b/virt/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = tdeio_virt.la
 
-tdeio_virt_la_SOURCES = virt.cc
+tdeio_virt_la_SOURCES = virt.cpp
 tdeio_virt_la_LIBADD = $(LIB_TDESYCOCA)
 tdeio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) $(LIB_TDECORE)
 
diff --git a/virt/virt.cc b/virt/virt.cpp
similarity index 99%
rename from virt/virt.cc
rename to virt/virt.cpp
index 1af46b5..e7a9fb1 100644
--- a/virt/virt.cc
+++ b/virt/virt.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                              virt.cc
+                              virt.cpp
                          -------------------
     begin                : Fri Dec 5 2003
     copyright            : (C) 2003 by Shie Erlich & Rafi Yanai