diff --git a/src/keypair.c b/src/keypair.c
new file mode 100644
index 0000000..a187dc7
--- /dev/null
+++ b/src/keypair.c
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2014 FH Bielefeld
+ *
+ * This file is part of a FH Bielefeld project.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301  USA
+ */
+
+#include "context.h"
+#include "keypair.h"
+#include "poly.h"
+
+#include <fmpz_poly.h>
+#include <fmpz.h>
+
+#include <stdbool.h>
+
+
+bool ntru_create_keypair(
+		fmpz_poly_t f,
+		fmpz_poly_t g,
+		keypair *pair,
+		ntru_context *ctx)
+{
+	bool retval = true;
+	fmpz_poly_t Fq,
+				Fp,
+				priv;
+
+	fmpz_poly_init(Fq);
+	fmpz_poly_init(Fp);
+	fmpz_poly_init(priv);
+
+
+	if (!poly_inverse_poly_q(f, Fq, ctx)) {
+		retval = false;
+		goto cleanup;
+	}
+
+	if (!poly_inverse_poly_q(f, Fp, ctx)) {
+		retval = false;
+		goto cleanup;
+	}
+
+	poly_starmultiply(Fq, g, priv, ctx, ctx->q);
+	fmpz_poly_scalar_mul_ui(priv, priv, ctx->p);
+	fmpz_poly_mod(priv, ctx->q);
+
+	fmpz_poly_init(pair->priv);
+	fmpz_poly_init(pair->pub);
+
+	fmpz_poly_set(pair->priv, priv);
+	fmpz_poly_set(pair->pub, Fp);
+
+cleanup:
+	fmpz_poly_clear(Fq);
+	fmpz_poly_clear(Fp);
+	fmpz_poly_clear(priv);
+	return retval;
+}
+
diff --git a/src/keypair.h b/src/keypair.h
new file mode 100644
index 0000000..9412c42
--- /dev/null
+++ b/src/keypair.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 FH Bielefeld
+ *
+ * This file is part of a FH Bielefeld project.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301  USA
+ */
+
+#ifndef NTRU_KEYPAIR_H
+#define NTRU_KEYPAIR_H
+
+
+#include "context.h"
+
+#include <fmpz_poly.h>
+#include <fmpz.h>
+#include <stdbool.h>
+
+
+typedef struct keypair keypair;
+
+
+struct keypair {
+	fmpz_poly_t priv;
+	fmpz_poly_t pub;
+};
+
+
+bool ntru_create_keypair(
+		fmpz_poly_t f,
+		fmpz_poly_t g,
+		keypair *pair,
+		ntru_context *ctx);
+
+
+#endif /* NTRU_KEYPAIR_H */