diff --git a/freeglut/freeglut/ChangeLog b/freeglut/freeglut/ChangeLog
index 51bb52a..70f4b9e 100644
--- a/freeglut/freeglut/ChangeLog
+++ b/freeglut/freeglut/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-16  Sven Panne  <sven.panne@aedion.de>
 
+	* src/freeglut_state.c: Added GLUT_AUX and GLUT_MULTISAMPLE as possible
+	  parameters for glutGet, making things more symmetric with
+	  glutSetOption.
 	* src/freeglutdll.def: Added missing API entries.
 
 2009-03-10  John F. Fay <john.fay.ctr@eglin.af.mil>
diff --git a/freeglut/freeglut/NEWS b/freeglut/freeglut/NEWS
index 2b05756..643b480 100644
--- a/freeglut/freeglut/NEWS
+++ b/freeglut/freeglut/NEWS
@@ -37,7 +37,7 @@ Mar ??, 2009:
 
     * Added new API entry to de-initialize freeglut:
 
-        glutExit( void );
+        void glutExit( void );
 
     * Added more special keys: GLUT_KEY_NUM_LOCK, GLUT_KEY_BEGIN GLUT_KEY_DELETE
 
@@ -45,9 +45,11 @@ Mar ??, 2009:
       constants GLUT_CAPTIONLESS and GLUT_BORDERLESS for glutInitDisplayMode
       (currently works for Windows only).
 
-    * Added support for multisampling: glutSetOption() accepts GLUT_MULTISAMPLE
-      now. The possible number of samples per pixels can be queried via the new
-      API entry
+    * Added support for multisampling: The number of samples per pixel to use
+      when GLUT_MULTISAMPLE is specified in glutInitDisplayMode() can be set via
+      glutSetOption() with parameter GLUT_MULTISAMPLE now. glutGetOption() with
+      the same token retrieves that value. The possible number of samples per
+      pixels can be queried via the new API entry
 
         int *glutGetModeValues( GLenum mode, int *size );
 
diff --git a/freeglut/freeglut/src/freeglut_state.c b/freeglut/freeglut/src/freeglut_state.c
index 0ab3efa..64196b7 100644
--- a/freeglut/freeglut/src/freeglut_state.c
+++ b/freeglut/freeglut/src/freeglut_state.c
@@ -537,11 +537,15 @@ int FGAPIENTRY glutGet( GLenum eWhat )
 
     case GLUT_DIRECT_RENDERING:
         return fgState.DirectContext;
-        break;
 
     case GLUT_FULL_SCREEN:
         return fghCheckFullScreen();
-        break;
+
+    case GLUT_AUX:
+      return fgState.AuxiliaryBufferNumber;
+
+    case GLUT_MULTISAMPLE:
+      return fgState.SampleNumber;
 
     default:
         fgWarning( "glutGet(): missing enum handle %d", eWhat );