diff --git a/rustfmt.license-template b/rustfmt.license-template
new file mode 100644
index 0000000..d2110ed
--- /dev/null
+++ b/rustfmt.license-template
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) {\d+} Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 0000000..a79b929
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,12 @@
+binop_separator              = "Back"
+enum_discrim_align_threshold = 30
+license_template_path        = "rustfmt.license-template"
+match_arm_align_threshold    = 30
+max_width                    = 140
+overflow_delimited_expr      = true
+reorder_impl_items           = true
+struct_field_align_threshold = 30
+unstable_features            = true
+use_field_init_shorthand     = true
+version                      = "Two"
+where_single_line            = true