diff --git a/apps/documents/models.py b/apps/documents/models.py
index 8185bb8297..d941c86c7d 100644
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -524,8 +524,14 @@ class DocumentVersion(models.Model):
             return None
             
     def rename(self, new_name):
+        new_filename, new_extension = os.path.splitext(new_name)
         name, extension = os.path.splitext(self.filename)
-        self.filename = u''.join([new_name, extension])
+        
+        # Preserve existing extension if new name doesn't has one
+        if new_extension:
+            extension = new_extension
+
+        self.filename = u''.join([new_filename, extension])
         self.save()