diff --git a/configure b/configure
index d5816b615f..56de3093a6 100644
--- a/configure
+++ b/configure
@@ -4309,7 +4309,6 @@ ri_suffix=
 test "$program_suffix" != NONE &&
   ri_suffix=$program_suffix
 
-LIBSUFFIX=$ri_suffix
 RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
 RUBY_LIB_PATH="${prefix}/lib/${RUBY_INSTALL_NAME}/${MAJOR}.${MINOR}"
 cat >> confdefs.h <<EOF
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index feee1c6d94..6ddd45231b 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -295,12 +295,12 @@ LDSHARED = @LDSHARED@
   mfile.printf "\
 
 program_transform_name = -e @program_transform_name@
-RUBY_INSTALL_NAME = `t='$(program_transform_name)'; echo ruby | sed $$t`
+RUBY_INSTALL_NAME = `t='$(program_transform_name)'; echo @RUBY_INSTALL_NAME@ | sed $$t`
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
-pkglibdir = $(libdir)/$(RUBY_INSTALL_NAME)
+pkglibdir = $(libdir)/$(RUBY_INSTALL_NAME)/@MAJOR@.@MINOR@
 archdir = $(pkglibdir)/@arch@
 @SET_MAKE@
 
diff --git a/instruby.rb b/instruby.rb
index 4839b5ef3b..f06b212957 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -17,7 +17,7 @@ end
 ruby_install_name = CONFIG["ruby_install_name"]
 bindir = destdir+CONFIG["bindir"]
 libdir = destdir+CONFIG["libdir"]
-pkglibdir = libdir + "/" + ruby_install_name
+pkglibdir = libdir + "/" + ruby_install_name+"/"+CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
 archdir = pkglibdir + "/" + CONFIG["arch"]
 mandir = destdir+CONFIG["mandir"] + "/man1"
 wdir = Dir.getwd
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 7e131fe890..0e7595531f 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -32,6 +32,7 @@ end
 
 $srcdir = CONFIG["srcdir"]
 $libdir = CONFIG["libdir"]+"/"+CONFIG["ruby_install_name"]
+$libdir += "/"+CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
 $archdir = $libdir+"/"+CONFIG["arch"]
 $install = CONFIG["INSTALL_PROGRAM"]
 $install_data = CONFIG["INSTALL_DATA"]
diff --git a/parse.c b/parse.c
index 379d0328bd..7700bb80dd 100644
--- a/parse.c
+++ b/parse.c
@@ -5721,7 +5721,6 @@ retry:
 		}
 		else if (c >= '0' && c <= '7' || c == '_') {
 		    /* octal */
-		    tokadd(c);
 	            do {
 			if (c  == '_') continue;
 			if (c < '0' || c > '7') break;
diff --git a/parse.y b/parse.y
index ca3505e490..434be07f85 100644
--- a/parse.y
+++ b/parse.y
@@ -2810,7 +2810,6 @@ retry:
 		}
 		else if (c >= '0' && c <= '7' || c == '_') {
 		    /* octal */
-		    tokadd(c);
 	            do {
 			if (c  == '_') continue;
 			if (c < '0' || c > '7') break;