diff --git a/systemd-company.el b/systemd-company.el
index 938f752..4989b3d 100644
--- a/systemd-company.el
+++ b/systemd-company.el
@@ -33,6 +33,7 @@
   ;; forcer on freenode threw together a curl monstrosity for achieving
   ;; the same:
   ;; curl -s http://www.freedesktop.org/software/systemd/man/systemd.directives.html | tr -d '\n' | sed 's/>/>\n/g' | sed -ne '/Unit directives/,/Options on the kernel/p' | sed -ne 's/.*<dt id="\([^-][^"]*\)=">.*/\1/p'
+  ;; Quote, wrap with fill-column at 72, insert into list and indent
   '("Accept" "AccuracySec" "After" "Alias" "AllowIsolate" "Also"
     "AppArmorProfile" "AssertACPower" "AssertArchitecture"
     "AssertCapability" "AssertDirectoryNotEmpty" "AssertFileIsExecutable"
@@ -41,15 +42,15 @@
     "AssertPathExistsGlob" "AssertPathIsDirectory" "AssertPathIsMountPoint"
     "AssertPathIsReadWrite" "AssertPathIsSymbolicLink" "AssertSecurity"
     "AssertVirtualization" "Backlog" "Before" "BindIPv6Only" "BindToDevice"
-    "BindsTo" "BlockIOAccounting" "BlockIODeviceWeight" "BlockIOReadBandwidth"
-    "BlockIOWeight" "BlockIOWriteBandwidth" "Broadcast" "BusName"
-    "BusPolicy" "CPUAccounting" "CPUAffinity" "CPUQuota"
-    "CPUSchedulingPolicy" "CPUSchedulingPriority" "CPUSchedulingResetOnFork"
-    "CPUShares" "Capabilities" "CapabilityBoundingSet" "ConditionACPower"
-    "ConditionArchitecture" "ConditionCapability"
-    "ConditionDirectoryNotEmpty" "ConditionFileIsExecutable"
-    "ConditionFileNotEmpty" "ConditionFirstBoot" "ConditionHost"
-    "ConditionKernelCommandLine" "ConditionNeedsUpdate"
+    "BindsTo" "BlockIOAccounting" "BlockIODeviceWeight"
+    "BlockIOReadBandwidth" "BlockIOWeight" "BlockIOWriteBandwidth"
+    "Broadcast" "BusName" "BusPolicy" "CPUAccounting" "CPUAffinity"
+    "CPUQuota" "CPUSchedulingPolicy" "CPUSchedulingPriority"
+    "CPUSchedulingResetOnFork" "CPUShares" "Capabilities"
+    "CapabilityBoundingSet" "ConditionACPower" "ConditionArchitecture"
+    "ConditionCapability" "ConditionDirectoryNotEmpty"
+    "ConditionFileIsExecutable" "ConditionFileNotEmpty" "ConditionFirstBoot"
+    "ConditionHost" "ConditionKernelCommandLine" "ConditionNeedsUpdate"
     "ConditionPathExists" "ConditionPathExistsGlob"
     "ConditionPathIsDirectory" "ConditionPathIsMountPoint"
     "ConditionPathIsReadWrite" "ConditionPathIsSymbolicLink"
@@ -62,27 +63,28 @@
     "FreeBind" "Group" "GuessMainPID" "IOSchedulingClass"
     "IOSchedulingPriority" "IPTOS" "IPTTL" "IgnoreOnIsolate"
     "IgnoreOnSnapshot" "IgnoreSIGPIPE" "InaccessibleDirectories"
-    "JobTimeoutAction" "JobTimeoutRebootArgument"
-    "JobTimeoutSec" "JoinsNamespaceOf" "KeepAlive" "KeepAliveIntervalSec"
-    "KeepAliveProbes" "KeepAliveTimeSec" "KillMode" "KillSignal"
-    "LimitAS" "LimitCORE" "LimitCPU" "LimitDATA" "LimitFSIZE" "LimitLOCKS"
-    "LimitMEMLOCK" "LimitMSGQUEUE" "LimitNICE" "LimitNOFILE" "LimitNPROC"
-    "LimitRSS" "LimitRTPRIO" "LimitRTTIME" "LimitSIGPENDING" "LimitSTACK"
+    "JobTimeoutAction" "JobTimeoutRebootArgument" "JobTimeoutSec"
+    "JoinsNamespaceOf" "KeepAlive" "KeepAliveIntervalSec" "KeepAliveProbes"
+    "KeepAliveTimeSec" "KillMode" "KillSignal" "LimitAS" "LimitCORE"
+    "LimitCPU" "LimitDATA" "LimitFSIZE" "LimitLOCKS" "LimitMEMLOCK"
+    "LimitMSGQUEUE" "LimitNICE" "LimitNOFILE" "LimitNPROC" "LimitRSS"
+    "LimitRTPRIO" "LimitRTTIME" "LimitSIGPENDING" "LimitSTACK"
     "ListenDatagram" "ListenFIFO" "ListenMessageQueue" "ListenNetlink"
     "ListenSequentialPacket" "ListenSpecial" "ListenStream" "MakeDirectory"
     "Mark" "MaxConnections" "MemoryAccounting" "MemoryLimit"
-    "MessageQueueMaxMessages" "MessageQueueMessageSize" "MountFlags"
-    "Nice" "NoDelay" "NoNewPrivileges" "NonBlocking" "NotifyAccess"
+    "MessageQueueMaxMessages" "MessageQueueMessageSize" "MountFlags" "Nice"
+    "NoDelay" "NoNewPrivileges" "NonBlocking" "NotifyAccess"
     "OOMScoreAdjust" "OnActiveSec" "OnBootSec" "OnCalendar" "OnFailure"
     "OnFailureJobMode" "OnStartupSec" "OnUnitActiveSec" "OnUnitInactiveSec"
     "Options" "PAMName" "PIDFile" "PartOf" "PassCredentials" "PassSecurity"
     "PathChanged" "PathExists" "PathExistsGlob" "PathModified"
     "PermissionsStartOnly" "Persistent" "Personality" "PipeSize" "Priority"
     "PrivateDevices" "PrivateNetwork" "PrivateTmp" "PropagatesReloadTo"
-    "ProtectHome" "ProtectSystem" "ReadOnlyDirectories" "ReadWriteDirectories"
-    "RebootArgument" "ReceiveBuffer" "RefuseManualStart" "RefuseManualStop"
-    "ReloadPropagatedFrom" "RemainAfterExit" "RemoveOnStop" "RequiredBy"
-    "Requires" "RequiresMountsFor" "RequiresOverridable" "Requisite"
+    "ProtectHome" "ProtectSystem" "ReadOnlyDirectories"
+    "ReadWriteDirectories" "RebootArgument" "ReceiveBuffer"
+    "RefuseManualStart" "RefuseManualStop" "ReloadPropagatedFrom"
+    "RemainAfterExit" "RemoveOnStop" "RequiredBy" "Requires"
+    "RequiresMountsFor" "RequiresOverridable" "Requisite"
     "RequisiteOverridable" "Restart" "RestartForceExitStatus"
     "RestartPreventExitStatus" "RestartSec" "RestrictAddressFamilies"
     "ReusePort" "RootDirectory" "RootDirectoryStartOnly" "RuntimeDirectory"
@@ -97,11 +99,11 @@
     "SyslogIdentifier" "SyslogLevel" "SyslogLevelPrefix"
     "SystemCallArchitectures" "SystemCallErrorNumber" "SystemCallFilter"
     "TCPCongestion" "TTYPath" "TTYReset" "TTYVHangup" "TTYVTDisallocate"
-    "TimeoutSec" "TimeoutStartSec" "TimeoutStopSec" "TimerSlackNSec"
-    "Transparent" "Type" "UMask" "Unit" "User" "UtmpIdentifier"
-    "WakeSystem" "WantedBy" "Wants" "WatchdogSec" "What" "Where"
-    "WorkingDirectory")
-  "Configuration directives for systemd 218.")
+    "TimeoutIdleSec" "TimeoutSec" "TimeoutStartSec" "TimeoutStopSec"
+    "TimerSlackNSec" "Transparent" "Type" "UMask" "Unit" "User"
+    "UtmpIdentifier" "WakeSystem" "WantedBy" "Wants" "WatchdogSec" "What"
+    "Where" "WorkingDirectory")
+  "Configuration directives for systemd 219.")
 
 (defun systemd-company--setup (enable)
   (when (fboundp 'systemd-company--setup-company)