diff --git a/src/units.c b/src/units.c
index c7fe549aff5d8cbcec77814f40f0682bd0fc3a8c..ca9e61a29403fce4963a3907df8a5f2948f5bb6f 100644
--- a/src/units.c
+++ b/src/units.c
@@ -279,6 +279,18 @@ void units_get_base_unit_exponents_array(float baseUnitsExp[5],
       baseUnitsExp[UNIT_TIME] = -2.f;
       break;
 
+    case UNIT_CONV_MOMENTUM:
+      baseUnitsExp[UNIT_MASS] = 1.f;
+      baseUnitsExp[UNIT_LENGTH] = 1.f;
+      baseUnitsExp[UNIT_TIME] = -1.f;
+      break;
+
+    case UNIT_CONV_ANGULAR_MOMENTUM:
+      baseUnitsExp[UNIT_MASS] = 1.f;
+      baseUnitsExp[UNIT_LENGTH] = 2.f;
+      baseUnitsExp[UNIT_TIME] = -1.f;
+      break;
+
     case UNIT_CONV_FORCE:
       baseUnitsExp[UNIT_MASS] = 1.f;
       baseUnitsExp[UNIT_LENGTH] = 1.f;
diff --git a/src/units.h b/src/units.h
index 4769fa80edbe0c10fd24e064528251e551282153..c1a47556df2cc78c872a24fb780ddc321605d099 100644
--- a/src/units.h
+++ b/src/units.h
@@ -76,6 +76,8 @@ enum unit_conversion_factor {
   UNIT_CONV_VELOCITY,
   UNIT_CONV_ACCELERATION,
   UNIT_CONV_POTENTIAL,
+  UNIT_CONV_MOMENTUM,
+  UNIT_CONV_ANGULAR_MOMENTUM,
   UNIT_CONV_FORCE,
   UNIT_CONV_ENERGY,
   UNIT_CONV_ENERGY_PER_UNIT_MASS,