diff --git a/edithelp.pl b/edithelp.pl
index 32db062291..5cde3149d4 100755
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -97,14 +97,12 @@ elsif ( $type eq 'modify' ) {
 	} else {
 		(-w $file) or $error = 
 			"WARNING: You will not be able save, because your webserver cannot write to '$file'. Contact your admin about help file permissions.";
-    	open (INFILE, $file) or die "Cannot read file '$file'";		# unlikely death, since we just checked
+    	open (my $fh, '<', $file) or die "Cannot read file '$file'";		# unlikely death, since we just checked
 		my $help = '';
-		while ( my $inp = <INFILE> ) {
-			unless ( $inp =~ /INCLUDE/ ) {
-				$help .= $inp;
-			}
+        while ( <$fh> ) {
+            $help .= /\[% INCLUDE .* %\](.*)$/ ? $1 : $_;
 		}
-		close INFILE;
+		close $fh;
     	$template->param( 'help' => $help );
 		$type = 'save';
 	}
diff --git a/help.pl b/help.pl
index 69e8ab8307..18d27ddee4 100755
--- a/help.pl
+++ b/help.pl
@@ -32,15 +32,9 @@ our $refer = $query->param('url');
 $refer = $query->referer()  if !$refer || $refer eq 'undefined';
 
 $refer =~ /koha\/(.*)\.pl/;
-my $from = "modules/help/$1.tt";
+my $from = "help/$1.tt";
 
-my $htdocs = C4::Context->config('intrahtdocs');
-my ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query );
-unless ( -e "$htdocs/$theme/$lang/$from" ) {
-    $from = "modules/help/nohelp.tt";
-    ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query );
-}
-my $template = C4::Templates->new('intranet', "$htdocs/$theme/$lang/$from");
+my $template = C4::Templates::gettemplate($from, 'intranet', $query);
 $template->param( referer => $refer );
 
 output_html_with_http_headers $query, "", $template->output;