diff -rupN facter-1.6.18-orig/lib/facter/ipaddress6.rb facter-1.6.18/lib/facter/ipaddress6.rb
--- facter-1.6.18-orig/lib/facter/ipaddress6.rb	2014-10-20 12:05:30.307287300 +0200
+++ facter-1.6.18/lib/facter/ipaddress6.rb	2014-10-20 12:48:35.908382409 +0200
@@ -40,7 +40,7 @@ Facter.add(:ipaddress6) do
   setcode do
     output = Facter::Util::IP.exec_ifconfig(["2>/dev/null"])
 
-    get_address_after_token(output, 'inet6 addr:')
+    get_address_after_token(output, 'inet6(?: addr:)?')
   end
 end
 
diff -rupN facter-1.6.18-orig/lib/facter/util/ip.rb facter-1.6.18/lib/facter/util/ip.rb
--- facter-1.6.18-orig/lib/facter/util/ip.rb	2014-10-20 12:05:30.307287300 +0200
+++ facter-1.6.18/lib/facter/util/ip.rb	2014-10-20 12:06:05.520780391 +0200
@@ -5,8 +5,8 @@ module Facter::Util::IP
   # a given platform or set of platforms.
   REGEX_MAP = {
     :linux => {
-      :ipaddress  => /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-      :ipaddress6 => /inet6 addr: ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :ipaddress  => /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+      :ipaddress6 => /inet6 (?:addr:)? ?((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
       :macaddress => /(?:ether|HWaddr)\s+((\w{1,2}:){5,}\w{1,2})/,
       :netmask  => /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
       :mtu  => /MTU:(\d+)/