diff --git a/ftyperc b/ftyperc
index b112f80..c773519 100644
--- a/ftyperc
+++ b/ftyperc
@@ -926,3 +926,9 @@
 *.sieve
 -syntax sieve
 -autoindent
+
+ Puppet
+*.pp
+-syntax puppet
+-pound_comment
+-autoindent
diff --git a/puppet.jsf b/puppet.jsf
new file mode 100644
index 0000000..e0fa7c7
--- /dev/null
+++ b/puppet.jsf
@@ -0,0 +1,109 @@
+# JOE syntax highlight file for Puppet
+
+=Idle
+=Comment	green
+=CommentLabel	bold green
+=Constant	cyan
+=Escape		bold cyan
+=Type		bold
+=Keyword	bold
+=Bad		bold red
+=Var		yellow
+=Brace		magenta
+
+=KeywordAttr	bold
+
+:idle Idle
+	*		idle
+	"\n"		idle
+	"#"		comment		recolor=-1
+	"{[]}"		brace		recolor=-1
+	"0"		first_digit	recolor=-1
+	"1-9"		decimal		recolor=-1
+	"\""		string		recolor=-1
+	"'"		char		recolor=-1
+	"/"		regex		recolor=-1
+	"$"		variable	recolor=-1
+	"a-zA-Z_"	ident		buffer
+	
+:comment Comment
+	*		comment
+	"\n"		idle
+
+:brace Brace
+	*		idle		noeat
+
+:first_digit Constant
+	*		idle		noeat
+	"0-7"		octal
+	"89"		bad_number	recolor=-1
+
+:bad_number Bad
+	*		idle		noeat
+	"0-9"		bad_number
+
+:octal Constant
+	*		idle		noeat
+	"0-7_"		octal
+	"89"		bad_number	recolor=-1
+
+:decimal Constant
+	*		idle		noeat
+	"0-9_"		decimal
+
+:char Constant
+	*		char
+	"'"		idle
+
+:string Constant
+	*		string
+	"\""		idle
+	"$"		maybe_string_subst	recolor=-1
+
+:maybe_string_subst Constant
+	*		string		noeat
+	"{"		string_subst	recolor=-2
+
+:string_subst Escape
+	*		string_subst
+	"}"		string
+
+:regex Constant
+	*		regex
+	"\\"		regex_quote	recolor=-1
+	"/"		idle
+
+:regex_quote Escape
+	*		regex
+
+:variable Var
+	*		idle		noeat
+	"a-zA-Z0-9_:"	variable
+
+:ident Idle
+	*		idle		noeat strings
+	"case"		kw
+	"class"		kw
+	"else"		kw
+	"elsif"		kw
+	"false"		kw
+	"if"		kw
+	"true"		kw
+	"undef"		kw
+	# prominent attrs
+	"ensure"	kw_attr
+	# methods
+	"fail"		method
+	"notice"	method
+	"template"	method
+done
+	"a-zA-Z0-9_"	ident
+
+:kw Keyword
+	*		idle		noeat
+
+:kw_attr KeywordAttr
+	*		idle		noeat
+
+:method Keyword
+	*		idle		noeat