diff --git a/TODO b/TODO
index bfd4db0f2..84f73c977 100644
--- a/TODO
+++ b/TODO
@@ -75,6 +75,7 @@ More items (first items will enter 'In progress list' first):
 
 Done (newest features come first):
 -- merging from kdpf_annotations branch --
+-> ADD: Obey DRM is now a configuration option
 -> FIX: leakfix when closing document while thread was running (no more leaks now)
 -> FIX: direct hi-performance pixels manipulation for highlighting (instead of the obsoleted setRasterOp)
 -> CHG: new search api. supports multiple searches at once, multiple highlighs per page
diff --git a/conf/dlggeneral.ui b/conf/dlggeneral.ui
index 603228d78..9a7bb2c16 100644
--- a/conf/dlggeneral.ui
+++ b/conf/dlggeneral.ui
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>320</width>
-            <height>169</height>
+            <height>300</height>
         </rect>
     </property>
     <vbox>
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -111,6 +111,14 @@
                                 <string>Show &amp;hints and info messages</string>
                             </property>
                         </widget>
+                        <widget class="QCheckBox">
+                            <property name="name">
+                                <cstring>kcfg_ObeyDRM</cstring>
+                            </property>
+                            <property name="text">
+                                <string>&amp;Obey DRM limitations</string>
+                            </property>
+                        </widget>
                     </vbox>
                 </widget>
                 <widget class="QLayoutWidget">
@@ -194,7 +202,11 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="local" impldecl="in implementation">dlggeneral.ui.h</include>
 </includes>
+<functions>
+    <function access="protected" specifier="non virtual">showEvent( QShowEvent * )</function>
+</functions>
 <pixmapfunction>DesktopIcon</pixmapfunction>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/conf/dlggeneral.ui.h b/conf/dlggeneral.ui.h
new file mode 100644
index 000000000..6d96d78ef
--- /dev/null
+++ b/conf/dlggeneral.ui.h
@@ -0,0 +1,19 @@
+/****************************************************************************
+** ui.h extension file, included from the uic-generated form implementation.
+**
+** If you want to add, delete, or rename functions or slots, use
+** Qt Designer to update this file, preserving your code.
+**
+** You should not define a constructor or destructor in this file.
+** Instead, write your code in functions called init() and destroy().
+** These will automatically be called by the form's constructor and
+** destructor.
+*****************************************************************************/
+
+#include <kapplication.h>
+
+void DlgGeneral::showEvent( QShowEvent * )
+{
+    if (kapp->authorize("skip_drm")) kcfg_ObeyDRM->show();
+    else kcfg_ObeyDRM->hide();
+}
diff --git a/conf/kpdf.kcfg b/conf/kpdf.kcfg
index 12a92b8c0..64d343250 100644
--- a/conf/kpdf.kcfg
+++ b/conf/kpdf.kcfg
@@ -53,6 +53,9 @@
   <entry key="WatchFile" type="Bool" >
    <default>true</default>
   </entry>
+  <entry key="ObeyDRM" type="Bool" >
+   <default>true</default>
+  </entry>
  </group>
  <group name="MainView" >
   <entry key="ShowLeftPanel" type="Bool" >
diff --git a/configure.in.in b/configure.in.in
index 62f5b415d..a5cdfac20 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -112,6 +112,6 @@ AC_ARG_ENABLE(kpdf-drm,
 		;;
  esac
 ]
-, AC_DEFINE(KPDF_HAVE_DRM, 1, [Defines if use DRM in kpdf])
+, AC_DEFINE(KPDF_HAVE_DRM, 0, [Defines if use DRM in kpdf])
 )
 
diff --git a/core/generator_pdf/generator_pdf.cpp b/core/generator_pdf/generator_pdf.cpp
index 24c288381..44771df16 100644
--- a/core/generator_pdf/generator_pdf.cpp
+++ b/core/generator_pdf/generator_pdf.cpp
@@ -15,6 +15,7 @@
 #include <qapplication.h>
 #include <qpaintdevicemetrics.h>
 #include <qregexp.h>
+#include <kapplication.h>
 #include <klocale.h>
 #include <kpassdlg.h>
 #include <kprinter.h>
@@ -213,6 +214,8 @@ const DocumentSynopsis * PDFGenerator::generateDocumentSynopsis()
 
 bool PDFGenerator::isAllowed( int permissions )
 {
+    if (kapp->authorize("skip_drm") && !Settings::obeyDRM()) return true;
+
     bool b = true;
     if (permissions & KPDFDocument::AllowModify) b = b && pdfdoc->okToChange();
     if (permissions & KPDFDocument::AllowCopy) b = b && pdfdoc->okToCopy();