diff --git a/TEMPLATE/TEMPLATE.c b/TEMPLATE/TEMPLATE.c
index d675d5437..99c767414 100644
--- a/TEMPLATE/TEMPLATE.c
+++ b/TEMPLATE/TEMPLATE.c
@@ -19,7 +19,7 @@ $/$***************************************************************************
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-	MA 02110-1301, USA.
+  MA 02110-1301, USA.
 ##
 ***************************************************************************/
 ##
diff --git a/TEMPLATE/TEMPLATE.h b/TEMPLATE/TEMPLATE.h
index 298990837..894fd8055 100644
--- a/TEMPLATE/TEMPLATE.h
+++ b/TEMPLATE/TEMPLATE.h
@@ -19,7 +19,7 @@ $/$***************************************************************************
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-	MA 02110-1301, USA.
+  MA 02110-1301, USA.
 ##
 ***************************************************************************/
 ##
diff --git a/TEMPLATE/conf/gb.net.smtp.conf b/TEMPLATE/conf/gb.net.smtp.conf
index 898dd1c81..7e074c17a 100644
--- a/TEMPLATE/conf/gb.net.smtp.conf
+++ b/TEMPLATE/conf/gb.net.smtp.conf
@@ -16,7 +16,7 @@
 #define __UNAME SMTP
 
 /* Description of the component */
-#define __DESCRIPTION STMP client component
+#define __DESCRIPTION SMTP client component
 
 /* If the component detection uses pkg-config */
 #define __USE_PKGCONFIG 1
diff --git a/TEMPLATE/make-component b/TEMPLATE/make-component
index a217f66e9..2409b32b1 100755
--- a/TEMPLATE/make-component
+++ b/TEMPLATE/make-component
@@ -20,7 +20,7 @@ cp -R template ../$1
 pushd . > /dev/null
 cd ../$1
 rm -f `find . -name \*~`
-for i in ../acinclude.m4 ../component.am ../config.guess ../config.sub ../main/share/gambas.h ../main/share/gb_common.h ../ltmain.sh ../reconf ../INSTALL ../COPYING ../missing ../install-sh; do
+for i in ../acinclude.m4 ../component.am ../main/share/gambas.h ../main/share/gb_common.h ../reconf ../INSTALL ../COPYING ../missing; do
 	ln -s $i;
 done
 popd > /dev/null