diff --git a/include/SFML/Graphics/Texture.hpp b/include/SFML/Graphics/Texture.hpp
index 8f12edc6..3ad55188 100644
--- a/include/SFML/Graphics/Texture.hpp
+++ b/include/SFML/Graphics/Texture.hpp
@@ -518,14 +518,25 @@ public:
     bool generateMipmap();
     
     ////////////////////////////////////////////////////////////
-    /// \brief Combined copy/move assignment operator
+    /// \brief Copy assignment operator
     ///
-    /// \param right Instance to assign (copied or moved)
+    /// \param copied Instance to assign
     ///
     /// \return Reference to self
     ///
     ////////////////////////////////////////////////////////////
-    Texture& operator =(Texture right);
+    Texture& operator =(const Texture& copied);
+
+    ////////////////////////////////////////////////////////////
+    /// \brief Move assignment operator
+    ///
+    /// \param moved instance to move from. Behaves like a
+    ///              default-constructed object after the move.
+    ///
+    /// \return Reference to self
+    ///
+    ////////////////////////////////////////////////////////////
+    Texture& operator =(Texture&& moved);
 
     ////////////////////////////////////////////////////////////
     /// \brief Swap the contents of this texture with those of another
diff --git a/src/SFML/Graphics/Texture.cpp b/src/SFML/Graphics/Texture.cpp
index ce52ec80..bfd71473 100644
--- a/src/SFML/Graphics/Texture.cpp
+++ b/src/SFML/Graphics/Texture.cpp
@@ -817,9 +817,20 @@ unsigned int Texture::getMaximumSize()
 
 
 ////////////////////////////////////////////////////////////
-Texture& Texture::operator =(Texture right)
+Texture& Texture::operator =(const Texture& copied)
 {
-    swap(right);
+    Texture temp(copied);
+    swap(temp);
+
+    return *this;
+}
+
+
+////////////////////////////////////////////////////////////
+Texture& Texture::operator =(Texture&& moved)
+{
+    Texture temp(std::move(moved));
+    swap(temp);
 
     return *this;
 }