diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 9fd0821..a85f8fd 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -299,4 +299,10 @@
  */
 #define POLARSSL_X509_WRITE_C
 
+/*
+ * Module:  library/xtea.c
+ * Caller:
+ */
+#define POLARSSL_XTEA_C
+
 #endif /* config.h */
diff --git a/include/polarssl/xtea.h b/include/polarssl/xtea.h
new file mode 100644
index 0000000..7a6b558
--- /dev/null
+++ b/include/polarssl/xtea.h
@@ -0,0 +1,72 @@
+/**
+ * \file xtea.h
+ *
+ *  Copyright (C) 2009       Paul Bakker
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef POLARSSL_XTEA_H
+#define POLARSSL_XTEA_H
+
+#define XTEA_ENCRYPT     1
+#define XTEA_DECRYPT     0
+
+
+/**
+ * \brief          XTEA context structure
+ */
+typedef struct
+{
+    unsigned long k[4];       /*!< key */
+}
+xtea_context;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief          XTEA key schedule
+ *
+ * \param ctx      XTEA context to be initialized
+ * \param key      the secret key
+ */
+void xtea_setup( xtea_context *ctx, unsigned char key[16] );
+
+/**
+ * \brief          XTEA cipher function
+ *
+ * \param ctx      XTEA context
+ * \param mode     XTEA_ENCRYPT or XTEA_DECRYPT
+ * \param input    8-byte input block
+ * \param output   8-byte output block
+ */
+void xtea_crypt( xtea_context *ctx,
+		 int mode,
+		 unsigned char input[8],
+		 unsigned char output[8] );
+
+/*
+ * \brief          Checkup routine
+ *
+ * \return         0 if successful, or 1 if the test failed
+ */
+int xtea_self_test( int verbose );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* xtea.h */