diff -u saplocales-2.2.5/SAPSHIFT_JIS\~ saplocales-2.2.5/SAPSHIFT_JIS
--- saplocales-2.2.5/SAPSHIFT_JIS~	2002-04-30 22:45:08.000000000 +1000
+++ saplocales-2.2.5/SAPSHIFT_JIS	2010-01-26 19:13:01.000000000 +1000
@@ -1,9 +1,10 @@
-<code_set_name> SJIS
+<code_set_name> SAPSHIFT_JIS
 <comment_char> %
 <escape_char> /
 <mb_cur_min> 1
 <mb_cur_max> 2
 
+% alias SAPSJIS
 CHARMAP
 <U0000>     /x00     NULL (NUL)
 <U0001>     /x01     START OF HEADING (SOH)
@@ -98,7 +98,7 @@ CHARMAP
 <U0059>     /x59     LATIN CAPITAL LETTER Y
 <U005A>     /x5a     LATIN CAPITAL LETTER Z
 <U005B>     /x5b     LEFT SQUARE BRACKET
-<U00A5>     /x5c     YEN SIGN
+<U005C>     /x5c     YEN SIGN
 <U005D>     /x5d     RIGHT SQUARE BRACKET
 <U005E>     /x5e     CIRCUMFLEX ACCENT
 <U005F>     /x5f     LOW LINE
@@ -132,7 +132,7 @@ CHARMAP
 <U007B>     /x7b     LEFT CURLY BRACKET
 <U007C>     /x7c     VERTICAL LINE
 <U007D>     /x7d     RIGHT CURLY BRACKET
-<U203E>     /x7e     OVERLINE
+<U007E>     /x7e     OVERLINE
 <U007F>     /x7f     DELETE (DEL)

 <U3000>     /x81/x40     IDEOGRAPHIC SPACE
diff -u saplocales-2.2.5/SAPSJIS.c\~ saplocales-2.2.5/SAPSJIS.c
--- saplocales-2.2.5/SAPSJIS.c~	2010-01-26 13:00:46.000000000 +1000
+++ saplocales-2.2.5/SAPSJIS.c	2010-01-26 20:19:52.000000000 +1000
@@ -4328,7 +4328,7 @@
 };
 
 /* Definitions used in the body of the `gconv' function.  */
-#define CHARSET_NAME		"SJIS//"
+#define CHARSET_NAME		"SAPSJIS//"
 #define FROM_LOOP		from_sjis
 #define TO_LOOP			to_sjis
 #define DEFINE_INIT		1