diff --git a/SConstruct b/SConstruct
index ecc60ad6..4bb80ac3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -137,6 +137,7 @@ fceux_dst = 'bin/fceux' + exe_suffix
 
 auxlib_src = 'src/auxlib.lua'
 auxlib_dst = 'bin/auxlib.lua'
+auxlib_inst_dst = prefix + '/share/fceux/auxlib.lua'
 
 fceux_h_src = 'src/drivers/win/help/fceux.chm'
 fceux_h_dst = 'bin/fceux.chm'
@@ -145,9 +146,18 @@ env.Command(fceux_h_dst, fceux_h_src, [Copy(fceux_h_dst, fceux_h_src)])
 env.Command(fceux_dst, fceux_src, [Copy(fceux_dst, fceux_src)])
 env.Command(auxlib_dst, auxlib_src, [Copy(auxlib_dst, auxlib_src)])
 
-# TODO: Fix this build script to gracefully install auxlib and the man page
 if prefix == None:
   prefix = "/usr/local"
 
+man_src = 'documentation/fceux.6'
+man_dst = prefix + '/share/man/man6/fceux.6'
+
+share_src = 'output/'
+share_dst = prefix + '/share/fceux/'
+
 env.Install(prefix + "/bin/", fceux)
-env.Alias('install', [prefix + "/bin/"])
+# TODO:  Where to put auxlib on "scons install?"
+env.Alias('install', env.Command(auxlib_inst_dst, auxlib_src, [Copy(auxlib_inst_dst, auxlib_src)]))
+env.Alias('install', env.Command(share_dst, share_src, [Copy(share_dst, share_src)]))
+env.Alias('install', env.Command(man_dst, man_src, [Copy(man_dst, man_src)]))
+env.Alias('install', (prefix + "/bin/"))
diff --git a/changelog.txt b/changelog.txt
index a5797663..23c6c8b8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,4 @@
+19-octo-2011 - prg318 - scons: "scons install" now installs auxlib and manpage
 19-octo-2011 - prg318 - scons: added --prefix option to build system and improved "install" target
 18-octo-2011 - prg318 - sdl: new hotkeys added - statestatenext savestateprev - useful for scrolling through savestates on a gamepad.  mapped to pgup and pgdown by default
 18-octo-2011 - prg318 - gtk: new video option for double buffering and ClipSides
diff --git a/documentation/fceux.6 b/documentation/fceux.6
index b3d2caf5..451c7e11 100644
--- a/documentation/fceux.6
+++ b/documentation/fceux.6
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH FCEUX 6 "August 10, 2008"
+.TH FCEUX 6 "October 18, 2011"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-fceux \- An emulator for the original (8-bit) Nintendo game console.
+fceux \- An emulator for the original (8-bit) Nintendo / Famicom game console.
 .SH SYNOPSIS
 .B fceux
 .RI [ options ]
@@ -66,13 +66,13 @@ center box;
 cb | cb, c | ci.
 NES Gamepad	Keyboard
 =
-Up  	W
-Down	S
-Left	A
-Right	D
-A	J
-B	K
-Select	TAB
+Up  	Keypad Up
+Down	Keypad Down
+Left	Keypad Left
+Right	Keypad Right
+A	F
+B	D
+Select	S
 Start	ENTER
 .TE
 .SS Other Commands