diff --git a/Cite.i18n.php b/Cite.i18n.php
new file mode 100644
index 000000000..af0fdac39
--- /dev/null
+++ b/Cite.i18n.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Internationalisation file for Cite extension.
+ *
+ * @package MediaWiki
+ * @subpackage Extensions
+*/
+
+$wgCiteMessages = array();
+
+$wgCiteMessages['en'] = array(
+	/*
+		Debug and errors
+	*/
+
+	# Internal errors
+	'cite_croak' => 'Cite croaked; $1: $2',
+
+	'cite_error_' . CITE_ERROR_STR_INVALID         => 'Internal error; invalid $str',
+	'cite_error_' . CITE_ERROR_KEY_INVALID_1       => 'Internal error; invalid key',
+	'cite_error_' . CITE_ERROR_KEY_INVALID_2       => 'Internal error; invalid key',
+	'cite_error_' . CITE_ERROR_STACK_INVALID_INPUT => 'Internal error; invalid stack key',
+
+	# User errors
+	'cite_error' => 'Cite error $1; $2',
+
+	'cite_error_' . CITE_ERROR_REF_NUMERIC_KEY               => 'Invalid call; expecting a non-integer key',
+	'cite_error_' . CITE_ERROR_REF_NO_KEY                    => 'Invalid call; no key specified',
+	'cite_error_' . CITE_ERROR_REF_TOO_MANY_KEYS             => 'Invalid call; invalid keys, e.g. too many or wrong key specified',
+	'cite_error_' . CITE_ERROR_REF_NO_INPUT                  => 'Invalid call; no input specified',
+	'cite_error_' . CITE_ERROR_REFERENCES_INVALID_INPUT      => 'Invalid input; expecting none',
+	'cite_error_' . CITE_ERROR_REFERENCES_INVALID_PARAMETERS => 'Invalid parameters; expecting none',
+	'cite_error_' . CITE_ERROR_REFERENCES_NO_BACKLINK_LABEL  => "Ran out of custom backlink labels, define more in the \"''cite_references_link_many_format_backlink_labels''\" message",
+
+	/*
+	   Output formatting
+	*/
+	'cite_reference_link_key_with_num' => '$1_$2',
+	# Ids produced by <ref>
+	'cite_reference_link_prefix'       => '_ref-',
+	'cite_reference_link_suffix'       => '',
+	# Ids produced by <references>
+	'cite_references_link_prefix'      => '_note-',
+	'cite_references_link_suffix'      => '',
+
+	'cite_reference_link'                              => '<sup id="$1" class="reference">[[#$2|<nowiki>[</nowiki>$3<nowiki>]</nowiki>]]</sup>',
+	'cite_references_link_one'                         => '<li id="$1">[[#$2|↑]] $3</li>',
+	'cite_references_link_many'                        => '<li id="$1">↑ $2 $3</li>',
+	'cite_references_link_many_format'                 => '[[#$1|<sup>$2</sup>]]',
+	# An item from this set is passed as $3 in the message above
+	'cite_references_link_many_format_backlink_labels' => 'a b c d e f g h i j k l m n o p q r s t u v w x y z',
+	'cite_references_link_many_sep'                    => "\xc2\xa0", // &nbsp;
+	'cite_references_link_many_and'                    => "\xc2\xa0", // &nbps;
+
+	# Although I could just use # instead of <li> above and nothing here that
+	# will break on input that contains linebreaks
+	'cite_references_prefix' => '<ol class="references">',
+	'cite_references_suffix' => '</ol>',
+);
+$wgCiteMessages['he'] = array(
+	/*
+		Debug and errors
+	*/
+
+	# Internal errors
+	'cite_croak' => 'בהערה יש שגיאה; $1: $2',
+
+	'cite_error_' . CITE_ERROR_STR_INVALID         => 'שגיאה פנימית; $str שגוי',
+	'cite_error_' . CITE_ERROR_KEY_INVALID_1       => 'שגיאה פנימית; מפתח שגוי',
+	'cite_error_' . CITE_ERROR_KEY_INVALID_2       => 'שגיאה פנימית; מפתח שגוי',
+	'cite_error_' . CITE_ERROR_STACK_INVALID_INPUT => 'שגיאה פנימית; מפתח שגוי בערימה',
+
+	# User errors
+	'cite_error' => 'שגיאת ציטוט $1; $2',
+
+	'cite_error_' . CITE_ERROR_REF_NUMERIC_KEY               => 'קריאה שגויה; מצפה למפתח שאינו מספר',
+	'cite_error_' . CITE_ERROR_REF_NO_KEY                    => 'קריאה שגויה; לא צוין מפתח',
+	'cite_error_' . CITE_ERROR_REF_TOO_MANY_KEYS             => 'קריאה שגויה; מפתחות שגויים, למשל, רבים מדי או שמפתח שגוי צוין',
+	'cite_error_' . CITE_ERROR_REF_NO_INPUT                  => 'קריאה שגויה; לא צוין קלט',
+	'cite_error_' . CITE_ERROR_REFERENCES_INVALID_INPUT      => 'קריאה שגויה; מצפה לכלום',
+	'cite_error_' . CITE_ERROR_REFERENCES_INVALID_PARAMETERS => 'פרמטרים שגויים; מצפה לכלום',
+	'cite_error_' . CITE_ERROR_REFERENCES_NO_BACKLINK_LABEL  => "נגמרו תוויות הקישורים המותאמים אישית, אנא הגדירו נוספים בהודעת המערכת \"''cite_references_link_many_format_backlink_labels''\"",
+
+	/*
+	   Output formatting
+	*/
+	'cite_reference_link_key_with_num' => '$1_$2',
+	# Ids produced by <ref>
+	'cite_reference_link_prefix'       => '_ref-',
+	'cite_reference_link_suffix'       => '',
+	# Ids produced by <references>
+	'cite_references_link_prefix'      => '_note-',
+	'cite_references_link_suffix'      => '',
+
+	'cite_reference_link'                              => '<sup id="$1" class="reference">[[#$2|<nowiki>[</nowiki>$3<nowiki>]</nowiki>]]</sup>',
+	'cite_references_link_one'                         => '<li id="$1">[[#$2|↑]] $3</li>',
+	'cite_references_link_many'                        => '<li id="$1">↑ $2 $3</li>',
+	'cite_references_link_many_format'                 => '[[#$1|<sup>$2</sup>]]',
+	# An item from this set is passed as $3 in the message above
+	'cite_references_link_many_format_backlink_labels' => 'a b c d e f g h i j k l m n o p q r s t u v w x y z',
+	'cite_references_link_many_sep'                    => "\xc2\xa0", // &nbsp;
+	'cite_references_link_many_and'                    => "\xc2\xa0", // &nbps;
+
+	# Although I could just use # instead of <li> above and nothing here that
+	# will break on input that contains linebreaks
+	'cite_references_prefix' => '<ol class="references">',
+	'cite_references_suffix' => '</ol>',
+);
+?>
diff --git a/Cite.php b/Cite.php
index 46d587348..941eb900c 100644
--- a/Cite.php
+++ b/Cite.php
@@ -55,59 +55,15 @@ for ( $i = 0; $i < count( $wgCiteErrors['user'] ); ++$i )
 	// User errors are positive integers
 	define( $wgCiteErrors['user'][$i], $i + 1 );
 
+# Internationlisation file
+require_once( 'Cite.i18n.php' );
+
 function wfCite() {
-	global $wgMessageCache;
-	$wgMessageCache->addMessages(
-		array(
-			/*
-			   Debug & errors
-			*/
-			
-			// Internal errors
-			'cite_croak' => 'Cite croaked; $1: $2',
-
-			'cite_error_' . CITE_ERROR_STR_INVALID => 'Internal error; invalid $str',
-			'cite_error_' . CITE_ERROR_KEY_INVALID_1 => 'Internal error; invalid key',
-			'cite_error_' . CITE_ERROR_KEY_INVALID_2 => 'Internal error; invalid key',
-			'cite_error_' . CITE_ERROR_STACK_INVALID_INPUT => 'Internal error; invalid stack key',
-
-			// User errors
-			'cite_error' => 'Cite error $1; $2',
-			
-			'cite_error_' . CITE_ERROR_REF_NUMERIC_KEY => 'Invalid call; expecting a non-integer key',
-			'cite_error_' . CITE_ERROR_REF_NO_KEY => 'Invalid call; no key specified',
-			'cite_error_' . CITE_ERROR_REF_TOO_MANY_KEYS => 'Invalid call; invalid keys, e.g. too many or wrong key specified',
-			'cite_error_' . CITE_ERROR_REF_NO_INPUT => 'Invalid call; no input specified',
-			'cite_error_' . CITE_ERROR_REFERENCES_INVALID_INPUT => 'Invalid input; expecting none',
-			'cite_error_' . CITE_ERROR_REFERENCES_INVALID_PARAMETERS => 'Invalid parameters; expecting none',
-			'cite_error_' . CITE_ERROR_REFERENCES_NO_BACKLINK_LABEL => "Ran out of custom backlink labels, define more in the \"''cite_references_link_many_format_backlink_labels''\" message",
-
-			/*
-			   Output formatting
-			*/
-			'cite_reference_link_key_with_num' => '$1_$2',
-			// Ids produced by <ref>
-			'cite_reference_link_prefix' => '_ref-',
-			'cite_reference_link_suffix' => '',
-			// Ids produced by <references>
-			'cite_references_link_prefix' => '_note-',
-			'cite_references_link_suffix' => '',
-
-			'cite_reference_link' => '<sup id="$1" class="reference">[[#$2|<nowiki>[</nowiki>$3<nowiki>]</nowiki>]]</sup>',
-			'cite_references_link_one' => '<li id="$1">[[#$2|↑]] $3</li>',
-			'cite_references_link_many' => '<li id="$1">↑ $2 $3</li>',
-			'cite_references_link_many_format' => '[[#$1|<sup>$2</sup>]]',
-			// An item from this set is passed as $3 in the message above
-			'cite_references_link_many_format_backlink_labels' => 'a b c d e f g h i j k l m n o p q r s t u v w x y z',
-			'cite_references_link_many_sep' => "\xc2\xa0", // &nbsp;
-			'cite_references_link_many_and' => "\xc2\xa0", // &nbps;
-
-			// Although I could just use # instead of <li> above and nothing here that
-			// will break on input that contains linebreaks
-			'cite_references_prefix' => '<ol class="references">',
-			'cite_references_suffix' => '</ol>',
-		)
-	);
+	# Add messages
+	global $wgMessageCache, $wgCiteMessages;
+	foreach( $wgCiteMessages as $key => $value ) {
+		$wgMessageCache->addMessages( $wgCiteMessages[$key], $key );
+	}
 	
 	class Cite {
 		/**#@+