diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index bf54d96..fd38b1d 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -40,4 +40,4 @@
 ^.travis*
 t/openssl/.*$
 ^src/liballinone*
-^src/update-makefiles.pl$
\ No newline at end of file
+^src/update-libtom.pl$
\ No newline at end of file
diff --git a/Makefile.PL b/Makefile.PL
index 891df7e..af0bbe5 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -101,6 +101,8 @@
 } if $^O eq 'MSWin32' && $Config{cc} =~ /gcc/;
 
   $extra_targets .= q{
+update-libtom:
+	$(NOECHO) perl src/update-libtom.pl
 versionsync:
 	$(NOECHO) perl _generators/version_patch.pl sync
 versioninc:
diff --git a/src/update-libtom.pl b/src/update-libtom.pl
new file mode 100755
index 0000000..f35cb89
--- /dev/null
+++ b/src/update-libtom.pl
@@ -0,0 +1,62 @@
+#!/usr/bin/env perl
+
+use Modern::Perl;
+use File::Find qw(find);
+use File::Slurper qw(read_text write_text);
+use FindBin;
+
+my $ltc_branch = "pr/pkcs8-improved";
+my $ltm_branch = "no-stdint-h";
+my $tmpdir = "/tmp/libtom.git.checkout.$$";
+
+warn "update libtommath from github (branch: $ltm_branch)..\n";
+system "rm -rf $tmpdir; mkdir $tmpdir";
+system "git clone -b $ltm_branch https://github.com/libtom/libtommath.git $tmpdir && cp -R $tmpdir/bn*.c $tmpdir/tom*.h $FindBin::Bin/ltm/ && echo ok";
+
+warn "update libtomcrypt from github (branch: $ltc_branch)..\n";
+system "rm -rf $tmpdir; mkdir $tmpdir";
+system "git clone -b $ltc_branch https://github.com/libtom/libtomcrypt.git $tmpdir && cp -R $tmpdir/src/* $FindBin::Bin/ltc/ && echo ok";
+system "rm -rf $tmpdir";
+
+### another style
+#system "wget https://github.com/libtom/libtomcrypt/tarball/$ltc_branch -q -O - | tar xz --wildcards --transform 's,^libtom.*/src/,,' -C '$FindBin::Bin/ltc' 'libtom*/src/*'";
+#system "wget https://github.com/libtom/libtommath/tarball/$ltm_branch -q -O - | tar xz --wildcards --transform 's,^libtom.*/,,' -C '$FindBin::Bin/ltm' 'libtom*/bn*.c' 'libtom*/tom*.h'";
+
+warn "gonna remove unwanted..\n";
+system 'rm', '-rf', "$FindBin::Bin/ltc/encauth/ocb/";
+system 'rm', '-rf', "$FindBin::Bin/ltc/modes/f8/";
+system 'rm', '-rf', "$FindBin::Bin/ltc/modes/lrw/";
+system 'rm', '-rf', "$FindBin::Bin/ltc/modes/xts/";
+system 'rm', '-rf', "$FindBin::Bin/ltc/pk/katja/";
+system 'rm', '-rf', "$FindBin::Bin/ltc/math/gmp_desc.c";
+
+### get rid of bn_mp_set_long_long + bn_mp_get_long_long
+system 'rm', '-rf', "$FindBin::Bin/ltm/bn_mp_set_long_long.c";
+system 'rm', '-rf', "$FindBin::Bin/ltm/bn_mp_get_long_long.c";
+system 'sed', '-i', 's,^\(int *mp_set_long_long.*\),/* \1 */,', 'src//ltm/tommath.h';
+system 'sed', '-i', 's,^\(unsigned *long *long *mp_get_long_long.*\),/* \1 */,', 'src//ltm/tommath.h';
+
+### MSVC hack required for VC6 compatibility
+#  #ifdef _MSC_VER
+#  typedef unsigned __int64 mp_word
+#  #else
+#  typedef unsigned long long mp_word;
+#  #endif
+system 'sed', '-i', 's,^\(typedef *unsigned *long *long *mp_word;\)$,#ifdef _MSC_VER\ntypedef unsigned __int64 mp_word;\n#else\n\1 /* PATCHED */\n#endif,', 'src//ltm/tommath.h';
+
+find({ wanted=>sub { unlink $_ if -f $_ && $_ =~ /test\.c$/ && $_ !~ /sha3_test.c$/ }, no_chdir=>1 }, "$FindBin::Bin/ltc");
+find({ wanted=>sub { unlink $_ if -f $_ && $_ =~ /\.o$/ }, no_chdir=>1 }, "$FindBin::Bin/ltm", "$FindBin::Bin/ltc");
+
+#fix modes
+warn "gonna chmod..\n";
+find({ wanted=>sub { system "chmod -x $_" if -f $_ && -x $_ && $_ =~ /\.(c|h)/ }, no_chdir=>1 }, "$FindBin::Bin/ltm", "$FindBin::Bin/ltc");
+ 
+my @objs = ();
+find({ wanted=>sub { push @objs, $_ if $_ =~ /\.c$/ && $_ !~ /tab\.c$/}, no_chdir=>1 }, "$FindBin::Bin/ltc");
+find({ wanted=>sub { push @objs, $_ if $_ =~ /\.c$/ }, no_chdir=>1 }, "$FindBin::Bin/ltm");
+
+my $o   = "OBJS=" . (join " ", map { s/\.c$/.o/r }   map { s!^.*/(ltm|ltc)/!$1/!r } @objs) =~ s/(.{80}) /$1 \\\n/gr;
+my $obj = "OBJS=" . (join " ", map { s/\.c$/.obj/r } map { s!^.*/(ltm|ltc)/!$1/!r } @objs) =~ s/(.{80}) /$1 \\\n/gr;
+
+write_text("$FindBin::Bin/Makefile", read_text("$FindBin::Bin/Makefile") =~ s/OBJS=.+?\.o\n/$o\n/sr);
+write_text("$FindBin::Bin/Makefile.nmake", read_text("$FindBin::Bin/Makefile.nmake") =~ s/OBJS=.+?\.obj\n/$obj\n/sr);
diff --git a/src/update-makefiles.pl b/src/update-makefiles.pl
deleted file mode 100755
index 93e2935..0000000
--- a/src/update-makefiles.pl
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env perl
-
-use Modern::Perl;
-use File::Find qw(find);
-use File::Slurper qw(read_text write_text);
-use FindBin;
-
-warn "gonna remove unwanted..\n";
-system 'rm', '-rf', "$FindBin::Bin/ltc/encauth/ocb/";
-system 'rm', '-rf', "$FindBin::Bin/ltc/modes/f8/";
-system 'rm', '-rf', "$FindBin::Bin/ltc/modes/lrw/";
-system 'rm', '-rf', "$FindBin::Bin/ltc/modes/xts/";
-system 'rm', '-rf', "$FindBin::Bin/ltc/pk/katja/";
-system 'rm', '-rf', "$FindBin::Bin/ltc/math/gmp_desc.c";
-
-### get rid of bn_mp_set_long_long + bn_mp_get_long_long
-system 'rm', '-rf', "$FindBin::Bin/ltm/bn_mp_set_long_long.c";
-system 'rm', '-rf', "$FindBin::Bin/ltm/bn_mp_get_long_long.c";
-system 'sed', '-i', 's,^\(int *mp_set_long_long.*\),/* \1 */,', 'src//ltm/tommath.h';
-system 'sed', '-i', 's,^\(unsigned *long *long *mp_get_long_long.*\),/* \1 */,', 'src//ltm/tommath.h';
-
-### MSVC hack required for VC6 compatibility
-#  #ifdef _MSC_VER
-#  typedef unsigned __int64 mp_word
-#  #else
-#  typedef unsigned long long mp_word;
-#  #endif
-system 'sed', '-i', 's,^\(typedef *unsigned *long *long *mp_word;\)$,#ifdef _MSC_VER\ntypedef unsigned __int64 mp_word;\n#else\n\1 /* PATCHED */\n#endif,', 'src//ltm/tommath.h';
-
-find({ wanted=>sub { unlink $_ if -f $_ && $_ =~ /test\.c$/ && $_ !~ /sha3_test.c$/ }, no_chdir=>1 }, "$FindBin::Bin/ltc");
-find({ wanted=>sub { unlink $_ if -f $_ && $_ =~ /\.o$/ }, no_chdir=>1 }, "$FindBin::Bin/ltm", "$FindBin::Bin/ltc");
-
-#fix modes
-warn "gonna chmod..\n";
-find({ wanted=>sub { system "chmod -x $_" if -f $_ && -x $_ && $_ =~ /\.(c|h)/ }, no_chdir=>1 }, "$FindBin::Bin/ltm", "$FindBin::Bin/ltc");
- 
-my @objs = ();
-find({ wanted=>sub { push @objs, $_ if $_ =~ /\.c$/ && $_ !~ /tab\.c$/}, no_chdir=>1 }, "$FindBin::Bin/ltc");
-find({ wanted=>sub { push @objs, $_ if $_ =~ /\.c$/ }, no_chdir=>1 }, "$FindBin::Bin/ltm");
-
-my $o   = "OBJS=" . (join " ", map { s/\.c$/.o/r }   map { s!^.*/(ltm|ltc)/!$1/!r } @objs) =~ s/(.{80}) /$1 \\\n/gr;
-my $obj = "OBJS=" . (join " ", map { s/\.c$/.obj/r } map { s!^.*/(ltm|ltc)/!$1/!r } @objs) =~ s/(.{80}) /$1 \\\n/gr;
-
-write_text("$FindBin::Bin/Makefile", read_text("$FindBin::Bin/Makefile") =~ s/OBJS=.+?\.o\n/$o\n/sr);
-write_text("$FindBin::Bin/Makefile.nmake", read_text("$FindBin::Bin/Makefile.nmake") =~ s/OBJS=.+?\.obj\n/$obj\n/sr);