diff --git a/include/SFML/Window/Joystick.h b/include/SFML/Window/Joystick.h
index 962876d..6fc29e9 100644
--- a/include/SFML/Window/Joystick.h
+++ b/include/SFML/Window/Joystick.h
@@ -29,6 +29,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Export.h>
+#include <SFML/Window/JoystickIdentification.h>
 
 
 ////////////////////////////////////////////////////////////
@@ -121,6 +122,19 @@ CSFML_WINDOW_API sfBool sfJoystick_isButtonPressed(unsigned int joystick, unsign
 ////////////////////////////////////////////////////////////
 CSFML_WINDOW_API float sfJoystick_getAxisPosition(unsigned int joystick, sfJoystickAxis axis);
 
+////////////////////////////////////////////////////////////
+/// \brief Get the joystick information
+///
+/// The result of this function will only remain valid until
+/// the next time the function is called.
+///
+/// \param joystick Index of the joystick
+///
+/// \return Structure containing joystick information.
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API sfJoystickIdentification sfJoystick_getIdentification(unsigned int joystick);
+
 ////////////////////////////////////////////////////////////
 /// \brief Update the states of all joysticks
 ///
diff --git a/include/SFML/Window/JoystickIdentification.h b/include/SFML/Window/JoystickIdentification.h
new file mode 100644
index 0000000..6deca26
--- /dev/null
+++ b/include/SFML/Window/JoystickIdentification.h
@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2014 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+// you must not claim that you wrote the original software.
+// If you use this software in a product, an acknowledgment
+// in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+// and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_JOYSTICKIDENDIFICATION_H
+#define SFML_JOYSTICKIDENDIFICATION_H
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Window/Export.h>
+
+
+////////////////////////////////////////////////////////////
+/// sfJoystickIdentification holds a joystick's identification
+////////////////////////////////////////////////////////////
+typedef struct
+{
+    const char*  name;
+    unsigned int vendorId;
+    unsigned int productId;
+} sfJoystickIdentification;
+
+
+#endif // SFML_JOYSTICKIDENDIFICATION_H
diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt
index b169f5f..c211aee 100644
--- a/src/SFML/Window/CMakeLists.txt
+++ b/src/SFML/Window/CMakeLists.txt
@@ -11,6 +11,7 @@ set(SRC
     ${INCROOT}/Event.h
     ${SRCROOT}/Joystick.cpp
     ${INCROOT}/Joystick.h
+    ${INCROOT}/JoystickIdentification.h
     ${SRCROOT}/Keyboard.cpp
     ${INCROOT}/Keyboard.h
     ${SRCROOT}/Mouse.cpp
diff --git a/src/SFML/Window/Joystick.cpp b/src/SFML/Window/Joystick.cpp
index 61ffa93..9824aac 100644
--- a/src/SFML/Window/Joystick.cpp
+++ b/src/SFML/Window/Joystick.cpp
@@ -64,6 +64,22 @@ float sfJoystick_getAxisPosition(unsigned int joystick, sfJoystickAxis axis)
     return sf::Joystick::getAxisPosition(joystick, static_cast<sf::Joystick::Axis>(axis));
 }
 
+////////////////////////////////////////////////////////////
+sfJoystickIdentification sfJoystick_getIdentification(unsigned int joystick)
+{
+    static std::string name;
+
+    sf::Joystick::Identification identification = sf::Joystick::getIdentification(joystick);
+    name = identification.name;
+
+    sfJoystickIdentification result;
+
+    result.name = name.c_str();
+    result.productId = identification.productId;
+    result.vendorId = identification.vendorId;
+
+    return result;
+}
 
 ////////////////////////////////////////////////////////////
 void sfJoystick_update(void)