diff --git a/manifests/config.pp b/manifests/config.pp
index 72d5e6dd78c2ab9c482ae8216ba47e55b7aeb33e..fe3231f3ec86e5725fe862463cc689f9962367de 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -30,7 +30,8 @@
 define postfix::config ($value, $ensure = present) {
 
   Augeas {
-    context => '/files/etc/postfix/main.cf',
+    incl    => '/etc/postfix/main.cf',
+    lens    => 'Postfix_Main.lns',
     notify  => Service['postfix'],
     require => File['/etc/postfix/main.cf'],
   }
diff --git a/manifests/transport.pp b/manifests/transport.pp
index 968cbfb3ec9135c7016bd00a5ef560602b7360b8..56759bb648f0e5bbc19a0ad364af70498007fbc0 100644
--- a/manifests/transport.pp
+++ b/manifests/transport.pp
@@ -69,7 +69,8 @@ define postfix::transport (
 
   augeas {"Postfix transport - ${name}":
     load_path => '/usr/share/augeas/lenses/contrib/',
-    context   => "/files${file}",
+    lens      => 'Postfix_Transport.aug',
+    incl      => $file,
     changes   => $changes,
     require   => [Package['postfix'], Augeas::Lens['postfix_transport']],
     notify    => Exec['generate /etc/postfix/transport.db'],
diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index 48e4986865ecf9964edc7ef34955b4a41fcecc5b..5540c7c2bb250cb803bef83549e700037e296c03 100644
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -59,7 +59,8 @@ define postfix::virtual (
 
   augeas {"Postfix virtual - ${name}":
     load_path => '/usr/share/augeas/lenses/contrib/',
-    context   => "/files${file}",
+    incl      => $file,
+    lens      => 'Postfix_Virtual.aug',
     changes   => $changes,
     require   => [Package['postfix'], Augeas::Lens['postfix_transport']],
     notify    => Exec['generate /etc/postfix/virtual.db'],