diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5041f92..95a7b81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,12 +19,14 @@ The rules for this file:
 ## [Unreleased]
 
 ### Authors
+- ianmkenney
 <!-- GitHub usernames of contributors to this release -->
 
 ### Added
 <!-- New added features -->
 
 ### Fixed
+- Removed ffast-math compiler flag (PR #14)
 <!-- Bug fixes -->
 
 ### Changed
diff --git a/setup.py b/setup.py
index 53cbd53..4b97bc1 100644
--- a/setup.py
+++ b/setup.py
@@ -27,9 +27,7 @@
 
 
 def extensions(debug=False, use_cython=True):
-    # TODO: remove fast-math?
-    encore_compile_args = ['-std=c99', '-ffast-math', '-funroll-loops',
-                           '-fsigned-zeros']
+    encore_compile_args = ['-std=c99', '-funroll-loops', '-fsigned-zeros']
 
     cython_linetrace = bool(os.environ.get('CYTHON_TRACE_NOGIL', False))