diff --git a/app/views/settings/_dmsf_settings.erb b/app/views/settings/_dmsf_settings.erb
index b7972aef..1094f4b9 100644
--- a/app/views/settings/_dmsf_settings.erb
+++ b/app/views/settings/_dmsf_settings.erb
@@ -81,6 +81,20 @@
 <%	end 
    end %>
 
+<p>
+  <%=content_tag(:label, l(:label_webdav) + ":") %>
+  <%=select_tag("settings[dmsf_webdav]",
+                options_for_select([
+                                [l(:select_option_deactivated), nil],
+                                [l(:select_option_activated), "1"]],
+                                :selected => @settings["dmsf_webdav"])) %><br/>
+  (<%=l(:label_default)%>: <%=l(:select_option_activated)%>)
+  <br/>
+  <%= l(:note_webdav).html_safe %>
+
+</p>
+
+
 <hr />
 <% begin
   	require 'xapian'
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b25a8320..78d7d92f 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -181,4 +181,7 @@ en-GB:
   :error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
   :note_maximum_email_filesize: "Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB."
   :label_maximum_email_filesize: "Maximum email attachment size"
-  
\ No newline at end of file
+  :parent_directory: "Parent Directory"
+  :note_webdav: "Webdav once enabled can be found at http://.../dmsf/webdav/"
+  :label_webdav: "Webdav functionality"
+
diff --git a/config/locales/en-IS.yml b/config/locales/en-IS.yml
index b6dba7bb..3e5a29b4 100644
--- a/config/locales/en-IS.yml
+++ b/config/locales/en-IS.yml
@@ -181,4 +181,6 @@ en-IS:
   :error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
   :note_maximum_email_filesize: "Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB."
   :label_maximum_email_filesize: "Maximum email attachment size"
-  
+  :parent_directory: "Parent Directory"
+  :note_webdav: "Webdav once enabled can be found at http://.../dmsf/webdav/"
+  :label_webdav: "Webdav functionality"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2ca4d59b..4f3e8479 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -189,4 +189,5 @@ en:
   :header_minimum_filesize: "File Error."
   :error_minimum_filesize: "The file %{file} is 0 bytes and will not be attached."
   :parent_directory: "Parent Directory"
-  
+  :note_webdav: "Webdav once enabled can be found at http://.../dmsf/webdav/"
+  :label_webdav: "Webdav functionality"
diff --git a/init.rb b/init.rb
index cb8878c7..e2c96b59 100644
--- a/init.rb
+++ b/init.rb
@@ -39,7 +39,8 @@ Redmine::Plugin.register :redmine_dmsf do
               "dmsf_zip_encoding" => "utf-8",
               "dmsf_index_database" => Rails.root.join("files/dmsf_index").to_s,
               "dmsf_stemming_lang" => "english",
-              "dmsf_stemming_strategy" => "STEM_NONE"
+              "dmsf_stemming_strategy" => "STEM_NONE",
+              "dmsf_webdav" => 1
             }
   
   menu :project_menu, :dmsf, { :controller => "dmsf", :action => "show" }, :caption => :menu_dmsf, :before => :documents, :param => :id
diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb
index d240b7d8..f89fc6da 100644
--- a/lib/redmine_dmsf/webdav/base_resource.rb
+++ b/lib/redmine_dmsf/webdav/base_resource.rb
@@ -22,6 +22,10 @@ module RedmineDmsf
       include Redmine::I18n
       include ActionView::Helpers::NumberHelper
 
+      def initialize(*args)
+        raise NotFound if Setting.plugin_redmine_dmsf["dmsf_webdav"].empty?
+        super(*args)
+      end
 
       DIR_FILE = "<tr><td class=\"name\"><a href=\"%s\">%s</a></td><td class=\"size\">%s</td><td class=\"type\">%s</td><td class=\"mtime\">%s</td></tr>"