--- hatari/tools/hmsa/hmsa.c	2019/04/09 08:49:53	1.1.1.5
+++ hatari/tools/hmsa/hmsa.c	2019/04/09 08:53:41	1.1.1.7
@@ -1,8 +1,8 @@
 /*
   Hatari tool: MSA and ST disk image creator and converter - hmsa.c
  
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #include <stdio.h>
@@ -124,8 +124,8 @@ based on the file name extension (.msa o
 If the given file doesn't exist and you give also a disk size\n\
 (SS, DS, HD, ED), an empty disk of the given size will be created.\n\
 \n\
-This software is distributed under the GNU Public License, version 2 or\n\
-at your option any later version. Please read the file gpl.txt for details.\n\
+This software is distributed under the GNU General Public License, version 2\n\
+or at your option any later version. Please read the file gpl.txt for details.\n\
 \n",
 		       name);
 }
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
 	}
 
 	srcfile = argv[1];
-	srcdot = strchr(srcfile, '.');
+	srcdot = strrchr(srcfile, '.');
 	if(srcdot == NULL) {
 		usage(argv[0]);
 		fprintf(stderr, "ERROR: extension missing for file name %s!\n", argv[1]);
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
 	}
 
 	strcpy(dstfile, srcfile);
-	dstdot = strchr(dstfile, '.');
+	dstdot = strrchr(dstfile, '.');
 	if (isMsa) {
 		/* Convert MSA to ST disk image */
 		strcpy(dstdot, ".st");