diff --git a/Source/OpenTK/Input/GamePadAxis.cs b/Source/OpenTK/Input/GamePadAxis.cs
index dd6b3192..f619ab6a 100644
--- a/Source/OpenTK/Input/GamePadAxis.cs
+++ b/Source/OpenTK/Input/GamePadAxis.cs
@@ -27,28 +27,12 @@ using System;
 
 namespace OpenTK.Input
 {
-	public enum GamePadAxis
+    internal enum GamePadAxis
     {
-        /// <summary>The first axis of the gamepad.</summary>
-        Axis0 = 0,
-        /// <summary>The second axis of the gamepad.</summary>
-        Axis1,
-        /// <summary>The third axis of the gamepad.</summary>
-        Axis2,
-        /// <summary>The fourth axis of the gamepad.</summary>
-        Axis3,
-        /// <summary>The fifth axis of the gamepad.</summary>
-        Axis4,
-        /// <summary>The sixth axis of the gamepad.</summary>
-        Axis5,
-        /// <summary>The seventh axis of the gamepad.</summary>
-        Axis6,
-        /// <summary>The eighth axis of the gamepad.</summary>
-        Axis7,
-        /// <summary>The ninth axis of the gamepad.</summary>
-        Axis8,
-        /// <summary>The tenth axis of the gamepad.</summary>
-        Axis9,
-	}
+        LeftX,
+        LeftY,
+        RightX,
+        RightY
+    }
 }
 
diff --git a/Source/OpenTK/Input/GamePadState.cs b/Source/OpenTK/Input/GamePadState.cs
index e85187f8..ad603017 100644
--- a/Source/OpenTK/Input/GamePadState.cs
+++ b/Source/OpenTK/Input/GamePadState.cs
@@ -37,14 +37,17 @@ namespace OpenTK.Input
         const float RangeMultiplier = 1.0f / (short.MaxValue + 1);
 
         Buttons buttons;
-        unsafe fixed short axes[GamePad.MaxAxisCount];
+        short left_stick_x;
+        short left_stick_y;
+        short right_stick_x;
+        short right_stick_y;
         bool is_connected;
 
         #region Public Members
 
-        public float GetAxis(GamePadAxis axis)
+        public GamePadThumbSticks ThumbSticks
         {
-            throw new NotImplementedException();
+            get { return new GamePadThumbSticks(left_stick_x, left_stick_y, right_stick_x, right_stick_y); }
         }
 
         public GamePadButtons Buttons
@@ -65,13 +68,15 @@ namespace OpenTK.Input
         public override string ToString()
         {
             return String.Format(
-                "{{Buttons: {0}; DPad: {1}; IsConnected: {2}",
-                Buttons, DPad, IsConnected);
+                "{{Sticks: {0}; Buttons: {1}; DPad: {2}; IsConnected: {3}",
+                ThumbSticks, Buttons, DPad, IsConnected);
         }
 
         public override int GetHashCode()
         {
-            return Buttons.GetHashCode() ^ DPad.GetHashCode() ^ IsConnected.GetHashCode();
+            return
+                ThumbSticks.GetHashCode() ^ Buttons.GetHashCode() ^
+                DPad.GetHashCode() ^ IsConnected.GetHashCode();
         }
 
         public override bool Equals(object obj)
@@ -87,6 +92,7 @@ namespace OpenTK.Input
         public bool Equals(GamePadState other)
         {
             return
+                ThumbSticks == other.ThumbSticks &&
                 Buttons == other.Buttons &&
                 DPad == other.DPad &&
                 IsConnected == other.IsConnected;
@@ -98,20 +104,26 @@ namespace OpenTK.Input
 
         internal void SetAxis(GamePadAxis axis, short value)
         {
-            if (IsAxisValid(axis))
+            switch (axis)
             {
-                int index = (int)axis;
-                unsafe
-                {
-                    fixed (short *paxes = axes)
-                    {
-                        *(paxes + index) = value;
-                    }
-                }
-            }
-            else
-            {
-                throw new ArgumentOutOfRangeException("axis");
+                case GamePadAxis.LeftX:
+                    left_stick_x = value;
+                    break;
+
+                case GamePadAxis.LeftY:
+                    left_stick_y = value;
+                    break;
+
+                case GamePadAxis.RightX:
+                    right_stick_x = value;
+                    break;
+
+                case GamePadAxis.RightY:
+                    right_stick_x = value;
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException("axis");
             }
         }
 
diff --git a/Source/OpenTK/Input/GamePadThumbSticks.cs b/Source/OpenTK/Input/GamePadThumbSticks.cs
new file mode 100644
index 00000000..e7c9d187
--- /dev/null
+++ b/Source/OpenTK/Input/GamePadThumbSticks.cs
@@ -0,0 +1,111 @@
+using System;
+// #region License
+//
+// GamePadThumbSticks.cs
+//
+// Author:
+//       Stefanos A. <stapostol@gmail.com>
+//
+// Copyright (c) 2006-2013 Stefanos Apostolopoulos
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// #endregion
+
+
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenTK.Input
+{
+    public struct GamePadThumbSticks : IEquatable<GamePadThumbSticks>
+    {
+        const float ConversionFactor = 1.0f / short.MaxValue;
+        short left_x, left_y;
+        short right_x, right_y;
+
+        internal GamePadThumbSticks(
+            short left_x, short left_y,
+            short right_x, short right_y)
+        {
+            this.left_x = left_x;
+            this.left_y = left_y;
+            this.right_x = right_x;
+            this.right_y = right_y;
+        }
+
+        #region Public Members
+
+        public Vector2 Left
+        {
+            get { return new Vector2(left_x * ConversionFactor, left_y * ConversionFactor); }
+        }
+
+        public Vector2 Right
+        {
+            get { return new Vector2(right_x * ConversionFactor, right_y * ConversionFactor); }
+        }
+
+        public static bool operator ==(GamePadThumbSticks left, GamePadThumbSticks right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(GamePadThumbSticks left, GamePadThumbSticks right)
+        {
+            return !left.Equals(right);
+        }
+
+        public override string ToString()
+        {
+            return String.Format(
+                "{{Left: {0}; Right: {1}}}",
+                Left, Right);
+        }
+
+        public override int GetHashCode()
+        {
+            return
+                left_x.GetHashCode() ^ left_y.GetHashCode() ^
+                right_x.GetHashCode() ^ right_y.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            return
+                obj is GamePadThumbSticks &&
+                Equals((GamePadThumbSticks)obj);
+        }
+
+        #endregion
+
+        #region IEquatable<GamePadThumbSticks> Members
+
+        public bool Equals(GamePadThumbSticks other)
+        {
+            return
+                left_x == other.left_x &&
+                left_y == other.left_y &&
+                right_x == other.right_x &&
+                right_y == other.right_y;
+        }
+
+        #endregion
+    }
+}
diff --git a/Source/OpenTK/OpenTK.csproj b/Source/OpenTK/OpenTK.csproj
index 723b4412..aa83bbee 100644
--- a/Source/OpenTK/OpenTK.csproj
+++ b/Source/OpenTK/OpenTK.csproj
@@ -133,6 +133,7 @@
     </Compile>
     <Compile Include="DisplayIndex.cs" />
     <Compile Include="Graphics\GraphicsModeComparer.cs" />
+    <Compile Include="Input\GamePadThumbSticks.cs" />
     <Compile Include="Input\IGamePadDriver.cs" />
     <Compile Include="Input\IInputDriver2.cs" />
     <Compile Include="Input\IKeyboardDriver2.cs" />