diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb
index 8ad2892c..5bccb2bc 100644
--- a/lib/redmine_dmsf/webdav/dmsf_resource.rb
+++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb
@@ -439,7 +439,7 @@ module RedmineDmsf
       #
       #
       def put(request, response)
-        filename = DmsfHelper.temp_dir+'/'+DmsfHelper.temp_filename(basename).gsub(/[\/\\]/,'')
+ 
         raise BadRequest if (collection?)
 
         raise Forbidden unless User.current.admin? || User.current.allowed_to?(:file_manipulation, project)
diff --git a/test/integration/dmsf_webdav_put_test.rb b/test/integration/dmsf_webdav_put_test.rb
new file mode 100644
index 00000000..4d268ca7
--- /dev/null
+++ b/test/integration/dmsf_webdav_put_test.rb
@@ -0,0 +1,320 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class DmsfWebdavIntegrationTest < RedmineDmsf::Test::IntegrationTest
+
+  fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, :dmsf_folders, :dmsf_files, :dmsf_file_revisions
+
+  def setup
+    timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
+    DmsfFile.storage_path = File.expand_path("./dmsf_test-#{timestamp}", DmsfHelper.temp_dir)
+    Dir.mkdir(DmsfFile.storage_path) unless File.directory?(DmsfFile.storage_path)
+    @admin = credentials('admin')
+    @jsmith = credentials('jsmith')
+    super
+  end
+
+  def teardown
+    @headers = nil
+    #Delete our tmp folder
+    begin
+      Dir.entries(DmsfFile.storage_path).each {|x|
+         next if (x == "." || x == "..")
+         begin
+           File.delete(File.expand_path(x, DmsfFile.storage_path))
+         rescue
+           warn "failed to delete #{File.expand_path(x, DmsfFile.storage_path)}"
+         end
+      }
+      Dir.delete(DmsfFile.storage_path)
+   rescue
+     warn "DELETE FAILED"
+   end
+  end
+
+  test "PUT denied unless authenticated" do
+    put 'dmsf/webdav'
+    assert_response 401
+
+    put "dmsf/webdav/#{Project.find(1).identifier}"
+    assert_response 401
+
+  end
+
+  test "PUT denied with failed authentication" do
+    put 'dmsf/webdav', nil, credentials('admin', 'badpassword')
+    assert_response 401
+
+    put "dmsf/webdav/#{Project.find(1).identifier}", nil, credentials('admin', 'badpassword')
+    assert_response 401
+  end
+
+  test "PUT denied at root level" do
+    put 'dmsf/webdav/test.txt', "1234", @admin.merge!({:content_type => :text})
+    assert_response 501
+  end
+
+  test "PUT denied on collection/folder" do
+    put "dmsf/webdav/#{Project.find(1).identifier}", "1234", @admin.merge!({:content_type => :text})
+    assert_response 403 #forbidden
+  end
+
+  test "PUT failed on non-existant project" do
+    put "dmsf/webdav/not_a_project/file.txt", "1234", @admin.merge!({:content_type => :text})
+    assert_response 409 # Conflict, not_a_project does not exist - file.txt cannot be created
+  end
+
+  test "PUT as admin granted on dmsf-enabled project" do
+
+    put "dmsf/webdav/#{Project.find(1).identifier}/test-1234.txt", "1234", @admin.merge!({:content_type => :text})
+    assert_response 201 #201 Created
+
+    #Lets check for our file
+    file = DmsfFile.find_file_by_name(Project.find(1), nil, "test-1234.txt")
+    assert !file.nil?, 'Check for files existance'
+
+  end
+
+  test "PUT failed as admin on non-dmsf enabled project" do
+    put "dmsf/webdav/#{Project.find(2).identifier}/test-1234.txt", "1234", @admin.merge!({:content_type => :text})
+    assert_response 409 #Should report conflict, as project 2 technically doesn't exist if not enabled
+
+    #Lets check for our file
+    file = DmsfFile.find_file_by_name(Project.find(2), nil, "test-1234.txt")
+    assert file.nil?, 'Check for files existance'
+  end
+
+  test "PUT failed when insuficient permissions on project" do
+
+    project = Project.find(2)
+    project.enable_module! :dmsf #Flag module enabled
+    role = Role.find(2)
+
+    put "dmsf/webdav/#{project.identifier}/test-1234.txt", "1234", @jsmith.merge!({:content_type => :text})
+    assert_response 409 #We don't hold the permission view_dmsf_folders, and thus project 2 doesn't exist to us.
+
+    role.add_permission! :view_dmsf_folders 
+
+    put "dmsf/webdav/#{project.identifier}/test-1234.txt", "1234", @jsmith.merge!({:content_type => :text})
+    assert_response 403 #We don't hold the permission file_manipulation - so we're unable to do anything with files
+
+    role.remove_permission! :view_dmsf_folders
+    role.add_permission! :file_manipulation
+
+    #Check we don't have write access even if we do have the file_manipulation permission
+    put "dmsf/webdav/#{project.identifier}/test-1234.txt", "1234", @jsmith.merge!({:content_type => :text})
+    assert_response 409 #We don't hold the permission view_dmsf_folders, and thus project 2 doesn't exist to us.
+
+    #Lets check for our file
+    file = DmsfFile.find_file_by_name(project, nil, "test-1234.txt")
+    assert file.nil?, 'File test-1234 was found in projects dmsf folder.'
+
+    role.remove_permission! :view_dmsf_folders
+    role.remove_permission! :file_manipulation
+  end
+
+  test "PUT succeeds for non-admin with correct permissions" do
+    project = Project.find(2)
+    project.enable_module! :dmsf #Flag module enabled
+    role = Role.find(2)
+
+    put "dmsf/webdav/#{project.identifier}/test-1234.txt", "1234", @jsmith.merge!({:content_type => :text})
+    assert_response 409 #We don't hold the permission view_dmsf_folders, and thus project 2 doesn't exist to us.
+
+    role.add_permission! :view_dmsf_folders
+    role.add_permission! :file_manipulation
+
+    #Check we don't have write access even if we do have the file_manipulation permission
+    put "dmsf/webdav/#{project.identifier}/test-1234.txt", "1234", @jsmith.merge!({:content_type => :text})
+    assert_response 201 #Now we have permissions :D
+
+    #Lets check for our file
+    file = DmsfFile.find_file_by_name(project, nil, "test-1234.txt")
+    assert !file.nil?, 'File test-1234 was not found in projects dmsf folder.'
+
+    role.remove_permission! :view_dmsf_folders
+    role.remove_permission! :file_manipulation
+  end
+
+  test "PUT writes revision successfully for unlocked file" do
+    project = Project.find(2)
+    project.enable_module! :dmsf #Flag module enabled
+    role = Role.find(2)
+
+    role.add_permission! :view_dmsf_folders
+    role.add_permission! :file_manipulation
+
+    file = DmsfFile.find_file_by_name(project, nil, "test.txt")
+    assert_difference('file.revisions.count') do
+      put "dmsf/webdav/#{project.identifier}/test.txt", "1234", @jsmith.merge!({:content_type => :text})
+      assert_response 201 #Created
+    end
+
+    role.remove_permission! :view_dmsf_folders
+    role.remove_permission! :file_manipulation
+
+  end
+
+  test "PUT fails revision when file is locked" do
+    role = Role.find(2)
+    project = Project.find(2)
+
+    project.enable_module! :dmsf #Flag module enabled
+
+    role.add_permission! :view_dmsf_folders
+    role.add_permission! :file_manipulation
+
+    log_user "admin", "admin" #login as jsmith
+    assert !User.current.anonymous?, "Current user is not anonymous"
+
+    file = DmsfFile.find_file_by_name(project, nil, "test.txt")
+    assert file.lock, "File failed to be locked by #{User.current.name}"
+
+    assert_no_difference('file.revisions.count') do
+      put "dmsf/webdav/#{project.identifier}/test.txt", "1234", @jsmith.merge!({:content_type => :text})
+      assert_response 423 #Locked
+    end
+
+    file.unlock
+    assert file.locked?, "File failed to unlock by #{User.current.name}"
+
+    role.add_permission! :view_dmsf_folders
+    role.add_permission! :file_manipulation
+
+  end
+
+  test "PUT fails revision when file is locked and user is administrator" do
+    role = Role.find(2)
+    project = Project.find(2)
+
+    project.enable_module! :dmsf #Flag module enabled
+
+    role.add_permission! :view_dmsf_folders
+    role.add_permission! :file_manipulation
+
+    log_user "jsmith", "jsmith" #login as jsmith
+    assert !User.current.anonymous?, "Current user is not anonymous"
+
+    file = DmsfFile.find_file_by_name(project, nil, "test.txt")
+    assert file.lock, "File failed to be locked by #{User.current.name}"
+
+    assert_no_difference('file.revisions.count') do
+      put "dmsf/webdav/#{project.identifier}/test.txt", "1234", @admin.merge!({:content_type => :text})
+      assert_response 423 #Created
+    end
+
+    file.unlock
+    assert file.locked?, "File failed to unlock by #{User.current.name}"
+
+    role.add_permission! :view_dmsf_folders
+    role.add_permission! :file_manipulation
+  end
+
+  test "PUT accepts revision when file is locked and user is same as lock holder" do
+    role = Role.find(2)
+    project = Project.find(2)
+
+    project.enable_module! :dmsf #Flag module enabled
+
+    role.add_permission! :view_dmsf_folders
+    role.add_permission! :file_manipulation
+
+    log_user "jsmith", "jsmith" #login as jsmith
+    assert !User.current.anonymous?, "Current user is not anonymous"
+
+    file = DmsfFile.find_file_by_name(project, nil, "test.txt")
+    assert file.lock, "File failed to be locked by #{User.current.name}"
+
+    assert_difference('file.revisions.count') do
+      put "dmsf/webdav/#{project.identifier}/test.txt", "1234", @jsmith.merge!({:content_type => :text})
+      assert_response 201 #Created
+    end
+
+    file.unlock
+    assert file.locked?, "File failed to unlock by #{User.current.name}"
+
+    role.add_permission! :view_dmsf_folders
+    role.add_permission! :file_manipulation
+  end
+
+
+
+
+#  test "should not list non-DMSF enabled project" do
+#
+#    get 'dmsf/webdav', nil, @headers
+#    assert_response :success
+#
+#    assert response.body.match(Project.find(2).name).nil?, "Unexpected find of project #{Project.find(2).name} in return data"
+#  end
+
+#  test "should return status 404 when accessing non-existant or non dmsf-enabled project" do
+#
+#    ## Test project resource object
+#
+#    get 'dmsf/webdav/project_does_not_exist', nil, @headers 
+#    assert_response 404
+#
+#    get "dmsf/webdav/#{Project.find(2).identifier}", nil, @headers
+#    assert_response 404
+#
+#
+#    ## Test dmsf resource object
+#
+#    get 'dmsf/webdav/project_does_not_exist/test1', nil, @headers
+#    assert_response 404
+#
+#    get "dmsf/webdav/#{Project.find(2).identifier}/test.txt", nil, @headers
+#    assert_response 404
+#  end
+#
+#  test "download file from DMSF enabled project" do
+#    get "dmsf/webdav/#{Project.find(1).identifier}/test.txt", nil, @headers
+#    assert_response 200
+#    assert (response.body != "1234"), "File downloaded with expected contents"
+#  end
+#
+#  test "should list dmsf contents within \"#{Project.find(1).identifier}\"" do
+#    get "dmsf/webdav/#{Project.find(1).identifier}", nil, @headers
+#    assert_response :success
+#    assert !response.body.match(DmsfFolder.find(1).title).nil?, "Expected to find #{DmsfFolder.find(1).title} in return data"
+#    assert !response.body.match(DmsfFile.find(1).name).nil?, "Expected to find #{DmsfFile.find(1).name} in return data"
+#  end
+#
+#  test "user assigned to project" do
+#
+#    #We'll be using project 2 and user jsmith for this test (Manager)
+#    project = Project.find(2)
+#    role = Role.find(2) #Developer role
+#    jsmith = credentials('jsmith')
+#    user = User.find(2)
+#
+#    get "dmsf/webdav/#{project.identifier}", nil, jsmith
+#    assert_response 404
+#
+#    project.enable_module! :dmsf #Flag module enabled
+#
+#    get "dmsf/webdav/#{project.identifier}", nil, jsmith
+#    assert_response 404
+#
+#    role.add_permission! :view_dmsf_folders #assign rights
+#
+#    get "dmsf/webdav/#{project.identifier}", nil, jsmith
+#    assert_response :success
+#
+#    get "dmsf/webdav/#{project.identifier}/test.txt", nil, jsmith
+#    assert_response 403 #Access is not granted as does not hold view_dmsf_files role (yet)
+#
+#    role.add_permission! :view_dmsf_files #assign rights
+#
+#    get "dmsf/webdav/#{project.identifier}/test.txt", nil, jsmith
+#    assert_response :success
+#    assert (response.body != "1234"), "File downloaded with expected contents"
+#
+#    #tear down
+#    project.disable_module! :dmsf
+#    role.remove_permission! :view_dmsf_folders
+#    role.remove_permission! :view_dmsf_files
+#    
+#  end
+
+end