diff --git a/src/TwigExtensionsServiceProvider.php b/src/TwigExtensionsServiceProvider.php
new file mode 100644
index 0000000..ac683aa
--- /dev/null
+++ b/src/TwigExtensionsServiceProvider.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Drupal\twig_extensions;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\DependencyInjection\ServiceProviderBase;
+
+/**
+ * Registers the twig services.
+ */
+class TwigExtensionsServiceProvider extends ServiceProviderBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function register(ContainerBuilder $container) {
+    parent::register($container);
+    // Ensure the Intl PHP extension is available before adding the service.
+    if (class_exists('IntlDateFormatter')) {
+      $container->register('twig_extensions.twig.intl', '\Twig_Extensions_Extension_Intl')
+        ->addTag('twig.extension');
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/twig_extensions.install b/twig_extensions.install
new file mode 100644
index 0000000..98516b0
--- /dev/null
+++ b/twig_extensions.install
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Implements hook_requirements().
+ */
+function twig_extensions_requirements($phase) {
+  $requirements = [];
+
+  if (class_exists('IntlDateFormatter')) {
+    $requirements['twig_extensions_intl']['description'] = t('Twig Extensions Intl is not active because the <a href=":intl_url">PHP Extension</a> is not installed. While not needed with Drupal having similar functionality, it may be desired.', [
+      ':intl_url' => 'http://php.net/manual/en/book.intl.php',
+    ]);
+    $requirements['twig_extensions_intl']['severity'] = REQUIREMENT_INFO;
+  }
+
+  return $requirements;
+}
diff --git a/twig_extensions.services.yml b/twig_extensions.services.yml
index 12d38ba..9fb9e7d 100644
--- a/twig_extensions.services.yml
+++ b/twig_extensions.services.yml
@@ -14,11 +14,6 @@ services:
     tags:
       - { name: twig.extension }
 
-  twig_extensions.twig.intl:
-    class: \Twig_Extensions_Extension_Intl
-    tags:
-      - { name: twig.extension }
-
   twig_extensions.twig.text:
     class: \Twig_Extensions_Extension_Text
     tags: