diff -Nru augeas-0.8.0/debian/changelog augeas-0.8.0/debian/changelog
--- augeas-0.8.0/debian/changelog	2011-04-11 23:05:45.000000000 +0200
+++ augeas-0.8.0/debian/changelog	2011-12-18 22:51:45.000000000 +0100
@@ -1,3 +1,11 @@
+augeas (0.8.0-0ubuntu5~pparaphink1) natty; urgency=low
+
+  * Add patches (LP: #807675):
+      - LP807675_sudoers_include.patch
+      - LP807675_sudoers_runas.patch 
+
+ -- Raphaël Pinson <raphink@ubuntu.com>  Sun, 18 Dec 2011 22:48:46 +0100
+
 augeas (0.8.0-0ubuntu4) natty; urgency=low
 
   * debian/rules: Work around segfault in make check by building with -O0 on armel.
diff -Nru augeas-0.8.0/debian/patches/LP807675_sudoers_include.patch augeas-0.8.0/debian/patches/LP807675_sudoers_include.patch
--- augeas-0.8.0/debian/patches/LP807675_sudoers_include.patch	1970-01-01 01:00:00.000000000 +0100
+++ augeas-0.8.0/debian/patches/LP807675_sudoers_include.patch	2011-12-18 22:46:00.000000000 +0100
@@ -0,0 +1,49 @@
+Index: augeas-0.8.0/lenses/sudoers.aug
+===================================================================
+--- augeas-0.8.0.orig/lenses/sudoers.aug	(revision 80a1f1f2a3c436cd00bd0561bcc819070b15f4c9)
++++ augeas-0.8.0/lenses/sudoers.aug	(revision b3b2e32f78965eb760c6613a30b98cd0a181fa2d)
+@@ -121,5 +121,5 @@
+ Map comments in "#comment" nodes *)
+ let comment =
+-  let sto_to_eol = store /([^ \t\n].*[^ \t\n]|[^ \t\n])/ in
++  let sto_to_eol = store (/([^ \t\n].*[^ \t\n]|[^ \t\n])/ - /includedir.*/) in
+   [ label "#comment" . del /[ \t]*#[ \t]*/ "# " . sto_to_eol . eol ]
+ 
+@@ -127,4 +127,9 @@
+ Map empty lines *)
+ let empty   = [ del /[ \t]*#?[ \t]*\n/ "\n" ]
++
++(* View: includedir *)
++let includedir =
++  [ key "#includedir" . Sep.space . store Rx.fspath . eol ]
++
+ 
+ (************************************************************************
+@@ -477,9 +482,10 @@
+        * <empty> lines
+        * <comments>
++       * <includedirs>
+        * <aliases>
+        * <defaults>
+        * <specs>
+ *)
+-let lns = ( empty | comment | alias | defaults | spec  )*
++let lns = ( empty | comment | includedir | alias | defaults | spec  )*
+ 
+ (* View: filter *)
+Index: augeas-0.8.0/lenses/tests/test_sudoers.aug
+===================================================================
+--- augeas-0.8.0.orig/lenses/tests/test_sudoers.aug	(revision 15c14bddbb83c10355d494ed8839c7e7a66ceec9)
++++ augeas-0.8.0/lenses/tests/test_sudoers.aug	(revision b3b2e32f78965eb760c6613a30b98cd0a181fa2d)
+@@ -40,4 +40,5 @@
+ 
+ @my\ admin\ group ALL=(root) NOPASSWD: /usr/bin/python /usr/local/sbin/filterlog -iu\\=www /var/log/something.log
++#includedir /etc/sudoers.d
+ "
+ 
+@@ -146,4 +147,5 @@
+           }
+       }
++      { "#includedir" = "/etc/sudoers.d" }
+ 
+ test Sudoers.parameter_integer_bool
diff -Nru augeas-0.8.0/debian/patches/LP807675_sudoers_runas.patch augeas-0.8.0/debian/patches/LP807675_sudoers_runas.patch
--- augeas-0.8.0/debian/patches/LP807675_sudoers_runas.patch	1970-01-01 01:00:00.000000000 +0100
+++ augeas-0.8.0/debian/patches/LP807675_sudoers_runas.patch	2011-12-18 22:48:11.000000000 +0100
@@ -0,0 +1,64 @@
+Index: augeas-0.8.0/lenses/sudoers.aug
+===================================================================
+--- augeas-0.8.0.orig/lenses/sudoers.aug	(revision 7086741abd5e7080e1f5af572d8d28dcdbe14a62)
++++ augeas-0.8.0/lenses/sudoers.aug	(revision e2cb384769665a633a60d835b611b661a0d4b7d5)
+@@ -420,11 +420,23 @@
+ (************************************************************************
+  * View: runas_spec
+- *   A runas specification for <spec>, using <alias_list>
+- *
+- *   Definition:
+- *     > Runas_Spec ::= '(' Runas_List ')'
+- *************************************************************************)
+-let runas_spec = Util.del_str "(" . alias_list "runas_user" sto_to_com
+-    . Util.del_str ")" . sep_cont_opt
++ *   A runas specification for <spec>, using <alias_list> for listing
++ *   users and/or groups used to run a command
++ *
++ *   Definition:
++ *     > Runas_Spec ::= '(' Runas_List ')' |
++ *     >                '(:' Runas_List ')' |
++ *     >                '(' Runas_List ':' Runas_List ')'
++ *************************************************************************)
++let runas_spec_user       = alias_list "runas_user" sto_to_com
++let runas_spec_group      = Util.del_str ":" . indent
++                            . alias_list "runas_group" sto_to_com
++
++let runas_spec_usergroup  = runas_spec_user . indent . runas_spec_group
++
++let runas_spec = Util.del_str "("
++                 . (runas_spec_user
++                    | runas_spec_group
++                    | runas_spec_usergroup )
++                 . Util.del_str ")" . sep_cont_opt
+ 
+ (************************************************************************
+Index: augeas-0.8.0/lenses/tests/test_sudoers.aug
+===================================================================
+--- augeas-0.8.0.orig/lenses/tests/test_sudoers.aug	(revision 4c116f82777ae562df98257ab5d61c0ef3c24a7a)
++++ augeas-0.8.0/lenses/tests/test_sudoers.aug	(revision e2cb384769665a633a60d835b611b661a0d4b7d5)
+@@ -28,4 +28,6 @@
+ # User privilege specification
+ root    ALL=(ALL) ALL
++root    ALL=(: ALL) ALL
++root    ALL=(ALL :ALL) ALL
+ 
+ # Members of the admin group may gain root privileges
+@@ -102,4 +104,17 @@
+ 	      { "command" = "ALL"
+ 	          { "runas_user"  = "ALL" } } } }
++      { "spec"
++          { "user" = "root" }
++          { "host_group"
++	      { "host" = "ALL" }
++	      { "command" = "ALL"
++            { "runas_group" = "ALL" } } } }
++      { "spec"
++          { "user" = "root" }
++          { "host_group"
++	      { "host" = "ALL" }
++	      { "command" = "ALL"
++	          { "runas_user"  = "ALL" }
++            { "runas_group" = "ALL" } } } }
+       {}
+       { "#comment" = "Members of the admin group may gain root privileges" }
diff -Nru augeas-0.8.0/debian/patches/series augeas-0.8.0/debian/patches/series
--- augeas-0.8.0/debian/patches/series	2011-04-04 21:04:06.000000000 +0200
+++ augeas-0.8.0/debian/patches/series	2011-12-18 22:48:24.000000000 +0100
@@ -1,2 +1,4 @@
 debian-changes-0.8.0-0ubuntu2
 debian-changes-0.8.0-0ubuntu3
+LP807675_sudoers_include.patch
+LP807675_sudoers_runas.patch