diff --git a/manifests/syslog/fragment.pp b/manifests/syslog/fragment.pp
index d71f4616ca82701af2a9c49cd77ca0c8c366cdbd..83a6e64000dcd669adf8fbe2a1d4d04bd152514f 100644
--- a/manifests/syslog/fragment.pp
+++ b/manifests/syslog/fragment.pp
@@ -31,7 +31,7 @@ define base::syslog::fragment(
 {
   $realname = "/etc/rsyslog.d/$name"
   $codename = "syslog::fragment"
-  $basetmpl = "base/etc/rsyslog.d/${name}.erb"
+  $basetmpl = "base/syslog/etc/rsyslog.d/${name}.erb"
 
   # Useful default template values
   if $syslog_target {
diff --git a/templates/syslog/etc/rsyslog.d/80-remote-default.pp b/templates/syslog/etc/rsyslog.d/80-remote-default.pp
new file mode 100644
index 0000000000000000000000000000000000000000..d1ad48c9a8f453cd7c155d96bf077893f9faa930
--- /dev/null
+++ b/templates/syslog/etc/rsyslog.d/80-remote-default.pp
@@ -0,0 +1,9 @@
+# 80-remote-default.conf
+#
+# Default remote logging when we don't have any other rules to 
+# direct the logging from remote hosts.
+
+$template Remote, "/var/log/remote/default.log"
+:source , !isequal , "<%= hostname %>" -?Remote
+:source , !isequal , "<%= hostname %>" stop
+